Merge branch 'master' of http://git.ycjcjy.com/civilized_city/pc-admin

src/pages/question/list/index.jsx

@@ -0,0 +1,202 @@
+import React from 'react';
+import { Button, Form, Row, Col, Card, List } from 'antd';
+import {
+  ProForm,
+  ProFormText,
+  ProFormSelect,
+  ProFormList,
+  PageContainer
+} from '@ant-design/pro-components';
+import { postTdLocQuestion, getTdLocQuestion, deleteTdLocQuestion, getTdLocQuestionById } from '@/service/tdlocquestion';
+
+const QuItem = (props) => {
+  const { qu, onEdit, onDelete } = props;
+
+  const quTitle = `${qu?.quType == 'fill' ? '填空' : '选择'} ${qu?.title}`
+
+  return (
+    <Card title={quTitle}
+      extra={(
+        <>
+          <Button type='link' onClick={onEdit}>修改</Button>
+          <Popconfirm
+            title="确认进行删除操作?"
+            onConfirm={onDelete}
+          >
+            <Button type='link' danger >删除</Button>
+          </Popconfirm>
+        </>
+      )}
+      style={{ marginTop: '24px' }}>
+      <Card.Meta
+        title={
+          qu?.quType != 'fill' ?
+            (
+              <Row gutter={24}>
+                {
+                  (qu || []).map((item) => {
+                    const anStr = `${item.answerCode} ${item.answer}`;
+
+                    return (
+                      <Col span={12} key={item.quId} style={{ height: '32px', lineHeight: '32px', fontWeight: 400 }}>
+                        {anStr}
+                      </Col>
+                    );
+                  })
+                }
+              </Row>
+            ) : null
+        }
+        description={(
+          <>
+            <h3>验收标准</h3>
+            <div dangerouslySetInnerHTML={{ __html: qu?.stand }} />
+          </>
+        )}
+      />
+    </Card>
+  );
+}
+
+export default React.forwardRef((props, ref) => {
+
+  const { itemId, onChange } = props;
+
+  const [open, setOpen] = React.useState(false);
+  const [quInfo, setQuInfo] = React.useState(false);
+  const [list, setList] = React.useState([]);
+  // const [and, setAnd] = React.useState([]);
+  const [form] = Form.useForm();
+
+  const onFinish = async (values) => {
+    const data = { ...(quInfo || {}), ...values, itemId };
+    const res = await postTdLocQuestion(data).then(x => x);
+    let found = false;
+    const newList = list.map(item => {
+      if (item.quId === res.quId) {
+        found = true;
+        return res;
+      } else {
+        return item
+      }
+    });
+
+    if (!found) {
+      newList.push(res);
+    }
+
+    setList(list);
+    onChange(res);
+
+    return true;
+  }
+
+  const onEditQu = (qu) => {
+    setQuInfo(qu);
+    setOpen(true);
+  }
+
+  const onDeleteQu = (qu) => {
+    if (qu?.quId) {
+      deleteTdLocQuestion(qu.quId).then(() => {
+        setList(list.filter(x => x.quId !== qu.quId));
+      })
+    } else {
+      setList(list.filter(x => x.quId !== qu.quId));
+    }
+  }
+
+  React.useEffect(() => {
+    if (quInfo) {
+      form.setFieldsValue(quInfo);
+    }
+  }, [quInfo]);
+
+  // React.useEffect(() => {
+  //   if (itemId) {
+  //     getTdLocQuestion({ pageSize: 500, itemId }).then((res) => {
+  //       setList(res.records);
+  //     });
+  //   }
+  // }, [itemId]);
+
+  React.useEffect(() => {
+    if (itemId) {
+      getTdLocQuestionById({ pageSize: 500, itemId }).then((res) => {
+        setList(res.records);
+      });
+    }
+  }, [itemId]);
+
+  React.useImperativeHandle(ref, () => ({
+    add: () => setOpen(true),
+  }), []);
+
+  return (
+    <div>
+      <Card>
+        <ProForm style={{ width: '800px' }} form={form} onFinish={onFinish} itemId={itemId} quInfo={quInfo} open={open}>
+          <ProFormText
+            name="title"
+            label="问题描述"
+            placeholder="请填写"
+            rules={[
+              {
+                required: true,
+                message: '请填写题干',
+              },
+            ]}
+          />
+          <ProFormSelect
+            name="quType"
+            label="问题类型"
+            fieldProps={{
+              style: { width: '100%' }
+            }}
+            valueEnum={{
+              radio: '单选',
+              fill: '填空'
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择问题类型',
+              },
+            ]}
+          />
+          <ProFormList
+            label="选项列表"
+            copyIconProps={false}
+            name="quAnswerList"
+          >
+            <Row gutter={24} style={{ width: '730px' }}>
+              <Col span={6}>
+                <ProFormText
+                  name="answerCode"
+                  label="答案选项"
+                  help="类似 A, B, C, D"
+                />
+              </Col>
+              <Col span={6}>
+                <ProFormText
+                  name="answer"
+                  label="答案"
+                  placeholder="具体选项内容"
+                />
+              </Col>
+            </Row>
+          </ProFormList>
+        </ProForm>
+
+      </Card>
+      <List
+        itemLayout="horizontal"
+        itemId={itemId}
+        quInfo={quInfo}
+        dataSource={list}
+        renderItem={(item) => <QuItem qu={item} onEdit={() => onEditQu(item)} onDelete={() => onDeleteQu(item)} />}
+      />
+
+    </div>
+  )
+});

src/routes/routes.jsx

@@ -30,6 +30,7 @@ import LocTypeList from "@/pages/locType/list";
 import LocTypeEdit from "@/pages/locType/edit";
 import IssueTypeList from "@/pages/issueType/list";
 import IssueTypeEdit from "@/pages/issueType/edit";
+import QuestionList from "@/pages/question/list";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -153,6 +154,16 @@ export const authRoutes = [
           // permission: 'form',
         },
       },
+      {
+        path: "question/list",
+        element: <QuestionList />,
+        meta: {
+          title: '点位问题',
+          // icon: <AppstoreOutlined />,
+          // permission: 'form',
+        },
+      },
+
     ]
   },
   {