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

@@ -0,0 +1,67 @@
+import { addRegulation, getRegulationById } from '@/services/regulation';
+import { PageContainer, ProForm, ProFormTextArea } 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) => {
+    //添加,修改
+    addRegulation({ ...values, id }).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={11}>
+                    <Space>{doms}</Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormTextArea
+            name="detail"
+            label="发布内容"
+            placeholder="请输入发布内容"
+            rules={[{ required: true, message: '请输入发布内容' }]}
+            allowClear={false}
+            width={750}
+          />
+        </ProForm>
+      </Card>
+    </PageContainer>
+  )
+}

src/pages/rotationChart/introduction/index.jsx

@@ -1,28 +1,93 @@
-import { ProFormTextArea, ProForm } from '@ant-design/pro-components';
-import { Col, Row, Space } from 'antd';
+import { getRegulationList, deleteRegulation } from '@/services/regulation';
+import { ProFormTextArea, ProForm, PageContainer, ProTable } from '@ant-design/pro-components';
+import { Button, message, Popconfirm } from 'antd';
+import { useNavigate } from 'react-router-dom';
+import { queryTable } from '@/utils/request';
+import { useRef, useState, useEffect } from 'react';
 
-export default (props) => {
-  console.log('小方', props);
-  return (
-    <ProForm
-      submitter={{
-        searchConfig: {
-          resetText: '返回',
-        },
-        onReset: () => navigate(-1),
-        render: (props, doms) => {
-          return (
-            <Row>
-              <Col span={8} offset={11}>
-                <Space>{doms}</Space>
-              </Col>
-            </Row>
-          );
-        },
-      }}
-    >
-      <ProFormTextArea placeholder="请输入..."></ProFormTextArea>
-    </ProForm>
+const IntroductionList = (props) => {
+  const actionRef = useRef();
+  const navigate = useNavigate();
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteRegulation(id).then((res) => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: 'id',
+      dataIndex: 'id',
+      width: 100,
+      search: false,
+      hideInTable: true,
+    },
+
+    {
+      title: '内容',
+      dataIndex: 'detail',
+      width: 400,
+      search: false,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 100,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, ']]');
+            navigate(`/cms/rotationChart/introduction/edit?id=${record.id}`);
+          }}
+        >
+          编辑
+        </Button>,
 
-  )
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        search={false}
+        actionRef={actionRef}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              navigate('/cms/rotationChart/introduction/edit');
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={queryTable(getRegulationList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
 }
+
+export default IntroductionList;

src/pages/stockClassification/list/index.jsx

@@ -1,5 +1,5 @@
 
-import { getStoreTypeList,deleteStoreType } from '@/services/stock';
+import { getStoreTypeList, deleteStoreType } from '@/services/stock';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
 import { useNavigate } from 'react-router-dom';

src/regulation/edit/index.jsx

@@ -1,4 +1,5 @@
-import { addRegulation, updataRegulation, getRegulationById } from '@/services/regulation';
+import { addRegulation, getRegulationById } from '@/services/regulation';
+import { queryDict } from '@/utils/request';
 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';
@@ -21,20 +22,12 @@ export default (props) => {
   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);
-      });
-    }
+    // if (id) {
+    //添加,修改
+    addRegulation({ ...values, id }).then((res) => {
+      message.success('成功');
+      navigate(-1);
+    });
     return false;
   };
 

src/regulation/index.jsx

@@ -1,6 +1,6 @@
-import { getRegulationList, updataRegulation, deleteRegulation } from '@/services/regulation';
+import { getRegulationList, deleteRegulation } from '@/services/regulation';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { useRef, useState } from 'react';
+import { useRef, useState, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { queryTable } from '@/utils/request';
 import { Button, message, Popconfirm } from 'antd';
@@ -9,15 +9,9 @@ const RegulationList = (props) => {
   const actionRef = useRef();
   const navigate = useNavigate();
 
-  // const updata = (row) => {
-  //   if (row.id) {
-  //     // 修改
-  //     updataRegulation(row.id, { ...values }).then((res) => {
-  //       message.success('修改成功');
-  //       navigate(-1);
-  //     });
-  //   }
-  // };
+  useEffect(() => {
+    actionRef.current.reload();
+  });
 
   const handleDelete = (id) => {
     if (id) {
@@ -33,28 +27,33 @@ const RegulationList = (props) => {
       title: 'id',
       dataIndex: 'id',
       width: 200,
+      search: false,
     },
     {
       title: '标题',
       dataIndex: 'title',
       width: 200,
+      search: true,
     },
 
     {
       title: '内容',
       dataIndex: 'detail',
       width: 200,
+      search: false,
     },
 
     {
       title: '发布人',
       dataIndex: 'create_person',
       width: 200,
+      search: false,
     },
     {
       title: '发布时间',
       dataIndex: 'create_date',
       width: 200,
+      search: false,
     },
     {
       title: '操作',
@@ -92,7 +91,7 @@ const RegulationList = (props) => {
   return (
     <PageContainer>
       <ProTable
-        search={false}
+        search={true}
         actionRef={actionRef}
         rowKey="id"
         toolBarRender={() => [

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';
@@ -30,6 +32,7 @@ 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 RotationChartIntroductionEdit from '@/pages/rotationChart/introduction/edit';
 import Roles from '@/pages/roles/index';
 import RegulationList from '@/regulation';
 import RegulationEdit from '@/regulation/edit';
@@ -97,12 +100,20 @@ export const authRoutes = [
         },
       },
       {
-        path: "guaranteeTask/print",
-        element: <GuaranteeTaskPrint />,
+        path: "evaluate",
+        element: <GuaranteeTaskEvaluate />,
         meta: {
           title: "任务评价",
         },
       },
+      {
+        path: "evaluate/list",
+        element: <GuaranteeTaskEvaluateList />,
+        meta: {
+          title: "任务评价",
+          hideInMenu: true,
+        },
+      },
     ],
   },
   {
@@ -208,6 +219,14 @@ export const authRoutes = [
           title: "本站信息简介",
         },
       },
+      {
+        path: "rotationChart/introduction/edit",
+        element: <RotationChartIntroductionEdit />,
+        meta: {
+          hideInMenu: true,
+          title: "本站信息简介维护",
+        },
+      },
       {
         path: 'regulation',
         element: <RegulationList />,

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/regulation.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request, { restful } from '@/utils/request';
 
 /**
  * 查询列表
@@ -8,18 +8,12 @@ import request from '@/utils/request';
 export const getRegulationList = (params) => request('/posts', { params });
 
 /**
-* 新增
-* @param {*} data
+* 新增,更新
+*  @param {*} data
+ *@param {*} id
 * @returns
 */
-export const addRegulation = (data) => request('/posts', { method: 'post', data });
-
-/**
- * 更新
- * @param {*} data
- * @returns
- */
-export const updataRegulation = (data, id) => request(`/posts/${id}`, { method: 'get', data });
+export const addRegulation = (data) => request(`/posts`, { method: 'post', data });
 
 /**
 * 详情
@@ -33,4 +27,12 @@ export const getRegulationById = (id) => request(`/posts/${id}`);
  * @param {*} id
  * @returns
  */
-export const deleteRegulation = (id) => request(`/posts/${id}`, { method: 'delete' });
+export const deleteRegulation = (id) => request(`/posts/${id}`, { method: 'delete' });
+
+//标题
+/**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getRegulationTitleList = (params) => request('/posts', { params, successTip: false });

vite.config.js

@@ -9,7 +9,7 @@ export default defineConfig({
     proxy: {
       '/api/': {
         // 要代理的地址
-        target: 'http://jgz.njyunzhi.com',
+        target: 'http://192.168.89.76:8087',
         // 配置了这个可以从 http 代理到 https
         // 依赖 origin 的功能可能需要这个，比如 cookie
         changeOrigin: true,