feats

src/pages/check/components/QuForm.jsx

@@ -0,0 +1,198 @@
+import React from 'react';
+import {
+  DrawerForm,
+  ProFormText,
+  ProFormSelect,
+  ProFormDigit,
+  ProFormList
+} from '@ant-design/pro-components';
+import { Form, Row, Col } from 'antd';
+import WangEditor from '@/components/Wangeditor';
+import { postTaCheckItemQu } from '@/service/tdlocquestion';
+
+export default (props) => {
+  const {open, onOpenChange, quInfo, itemId, onChange} = props;
+  const [form] = Form.useForm();
+  
+  const onFinish = async (values) => {
+    const data = {
+      ...(quInfo || {}),
+      ...values,
+      itemId,
+    }
+
+    const res = await postTaCheckItemQu(data).then(x => x);
+
+    onChange(res);
+    return true;
+  }
+
+  React.useEffect(() => {
+    if (quInfo) {
+      form.setFieldsValue(quInfo);
+    } else {
+      form.resetFields();
+    }
+  }, [quInfo]);
+
+  return (
+    <DrawerForm
+      title="问题维护"
+      open={open}
+      width={800}
+      form={form}
+      destroyOnClose
+      onFinish={onFinish}
+      onOpenChange={onOpenChange}
+    >
+      <Row gutter={24}>
+        <Col span={6}>
+          <ProFormText
+            name="sortNo"
+            label="序号"
+            placeholder="请填写"
+            rules={[
+              {
+                required: true,
+                message: '请填写序号',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={18}>
+          <ProFormText
+            name="title"
+            label="题干描述"
+            placeholder="请填写"
+            rules={[
+              {
+                required: true,
+                message: '请填写题干',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Row gutter={24}>
+        <Col span={12}>
+          <ProFormSelect
+            name="quType"
+            label="问题类型"
+            fieldProps={{
+              style: { width: '100%' }
+            }}
+            valueEnum={{
+              radio: '单选',
+              fill: '填空'
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择问题类型',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={12}>
+          <ProFormSelect
+            name="computeType"
+            label="计分方式"
+            fieldProps={{
+              style: { width: '100%' }
+            }}
+            valueEnum={{
+              '+': '得分',
+              '-': '扣分'
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择计分方式',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Row gutter={24}>
+        <Col span={12}>
+          <ProFormDigit
+            name="maxScore"
+            label="最 高 分"
+            min={0}
+            fieldProps={{ precision: 2 }}
+            rules={[
+              {
+                required: true,
+                message: '请设置最高分',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={12}>
+          <ProFormDigit
+            name="anScore"
+            label="单项计分"
+            min={0}
+            fieldProps={{ precision: 2 }}
+            rules={[
+              {
+                required: true,
+                message: '请设置单项计分',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Form.Item name="stand" label="评分标准">
+        <WangEditor
+          height="200px"
+          toolbarConfig={{
+            toolbarKeys: [
+              'headerSelect',
+              'blockquote',
+              '|',
+              'bold',
+              'underline',
+              'italic',
+              'color',
+              'fontSize',
+              '|',
+              'bulletedList',
+              'numberedList',
+            ]
+          }}
+        />
+      </Form.Item>
+      <ProFormList
+        name="answerList"
+        label="选项列表"
+        copyIconProps={false}
+      >
+        <Row gutter={24} style={{width: '730px'}}>
+          <Col span={6}>
+            <ProFormText
+              name="answerCode"
+              label="选项"
+              help="类似 A, B, C, D"
+            />
+          </Col>
+          <Col span={6}>
+            <ProFormDigit
+              name="score"
+              label="计分"
+              min={0}
+              fieldProps={{ precision: 2 }}
+            />
+          </Col>
+          <Col span={12}>
+            <ProFormText
+              name="answer"
+              label="答案"
+              placeholder="具体选项内容"
+            />
+          </Col>
+        </Row>
+      </ProFormList>
+    </DrawerForm>
+  )
+}

src/pages/check/components/QuManage.jsx

@@ -1,24 +1,31 @@
 import React from 'react';
-import { Button, Form, Row, Col, Card, Input, Modal, List } from 'antd';
-import {
-  DrawerForm,
-  ProFormGroup,
-  ProFormText,
-  ProFormSelect,
-  ProFormDigit,
-  ProFormList
-} from '@ant-design/pro-components';
-import WangEditor from '@/components/Wangeditor';
+import { Button, Form, Row, Col, Card, List, Popconfirm } from 'antd';
+import QuForm from './QuForm';
 import { postTaCheckItemQu, getTaCheckItemQu } from '@/service/tdlocquestion';
-import { getTaCheckItemAn } from '@/service/tacheckiteman';
+import { deleteTaCheckItemQu } from '@/service/tacheckitemqu';
+import { message } from 'antd';
 
 const QuItem = (props) => {
-   const { qu, onEdit } = props;
+  const { qu, onEdit, onDelete } = props;
 
-   const quTitle = `${qu?.sortNo}. [${qu?.quType == 'fill' ? '填空' : '选择'}] ${qu?.title} (分值: ${qu?.computeType} ${qu?.anScore}/${qu?.maxScore})`
+  const quTitle = `${qu?.sortNo}. [${qu?.quType == 'fill' ? '填空' : '选择'}] ${qu?.title} (分值: ${qu?.computeType} ${qu?.anScore}/${qu?.maxScore})`
 
   return (
-    <Card title={quTitle} extra={<Button type='link' onClick={onEdit}>修改</Button>} style={{marginTop: '24px'}}>
+    <Card
+      title={quTitle} 
+      style={{marginTop: '24px'}}
+      extra={(
+        <>
+          <Button type='link' onClick={onEdit}>修改</Button>
+          <Popconfirm
+            title="确认进行删除操作?"
+            onConfirm={onDelete}
+          >
+            <Button type='link' danger >删除</Button>
+          </Popconfirm>
+        </>
+      )} 
+    >
       <Card.Meta
         title={
           qu?.quType != 'fill' ?
@@ -56,13 +63,8 @@ export default React.forwardRef((props, ref) => {
   const [open, setOpen] = React.useState(false);
   const [quInfo, setQuInfo] = React.useState(false);
   const [list, setList] = React.useState([]);
-  // const [anList, setAnList] = React.useState([]);
-  const [form] = Form.useForm();
-
-  const onFinish = async (values) => {
-    const data = { ...(quInfo || {}), ...values, itemId }
-    const res = await postTaCheckItemQu(data);
 
+  const onFinish = (res) => {
     let found = false;
     const newList = list.map(item => {
       if (item.quId === res.quId) {
@@ -78,9 +80,6 @@ export default React.forwardRef((props, ref) => {
     }
 
     setList(list);
-    onChange(res);
-
-    return true;
   }
 
   const onEditQu = (qu) => {
@@ -88,11 +87,15 @@ export default React.forwardRef((props, ref) => {
     setOpen(true);
   }
 
-  React.useEffect(() => {
-    if (quInfo) {
-      form.setFieldsValue(quInfo);
+  const onDeleteQu = (qu) => {
+    if (qu?.quId) {
+      deleteTaCheckItemQu(qu.quId).then(() => {
+        setList(list.filter(x => x.quId !== qu.quId));
+      })
+    } else {
+      setList(list.filter(x => x.quId !== qu.quId));
     }
-  }, [quInfo]);
+  }
 
   React.useEffect(() => {
     if (itemId) {
@@ -103,149 +106,26 @@ export default React.forwardRef((props, ref) => {
   }, [itemId]);
 
   React.useImperativeHandle(ref, () => ({
-    add: () => setOpen(true),
+    add: () => {
+      setQuInfo();
+      setOpen(true);
+    },
   }), []);
 
   return (
-    <div>
-      <DrawerForm title="问题维护" open={open} width={800} form={form} onFinish={onFinish} onOpenChange={setOpen}>
-        <ProFormText
-          name="title"
-          label="题干描述"
-          placeholder="请填写"
-          rules={[
-            {
-              required: true,
-              message: '请填写题干',
-            },
-          ]}
-        />
-        <Row gutter={24}>
-          <Col span={12}>
-            <ProFormSelect
-              name="quType"
-              label="问题类型"
-              fieldProps={{
-                style: { width: '100%' }
-              }}
-              valueEnum={{
-                radio: '单选',
-                fill: '填空'
-              }}
-              rules={[
-                {
-                  required: true,
-                  message: '请选择问题类型',
-                },
-              ]}
-            />
-          </Col>
-          <Col span={12}>
-            <ProFormSelect
-              name="computeType"
-              label="计分方式"
-              fieldProps={{
-                style: { width: '100%' }
-              }}
-              valueEnum={{
-                '+': '得分',
-                '-': '扣分'
-              }}
-              rules={[
-                {
-                  required: true,
-                  message: '请选择计分方式',
-                },
-              ]}
-            />
-          </Col>
-        </Row>
-        <Row gutter={24}>
-          <Col span={12}>
-            <ProFormDigit
-              name="maxScore"
-              label="最 高 分"
-              min={0}
-              fieldProps={{ precision: 2 }}
-              rules={[
-                {
-                  required: true,
-                  message: '请设置最高分',
-                },
-              ]}
-            />
-          </Col>
-          <Col span={12}>
-            <ProFormDigit
-              name="anScore"
-              label="单项计分"
-              min={0}
-              fieldProps={{ precision: 2 }}
-              rules={[
-                {
-                  required: true,
-                  message: '请设置单项计分',
-                },
-              ]}
-            />
-          </Col>
-        </Row>
-        <Form.Item name="stand" label="评分标准">
-          <WangEditor
-            height="200px"
-            toolbarConfig={{
-              toolbarKeys: [
-                'headerSelect',
-                'blockquote',
-                '|',
-                'bold',
-                'underline',
-                'italic',
-                'color',
-                'fontSize',
-                '|',
-                'bulletedList',
-                'numberedList',
-              ]
-            }}
-          />
-        </Form.Item>
-        <ProFormList
-          name="answerList"
-          label="选项列表"
-          copyIconProps={false}
-        >
-          <Row gutter={24} style={{width: '730px'}}>
-            <Col span={6}>
-              <ProFormText
-                name="answerCode"
-                label="选项"
-                help="类似 A, B, C, D"
-              />
-            </Col>
-            <Col span={6}>
-              <ProFormDigit
-                name="score"
-                label="计分"
-                min={0}
-                fieldProps={{ precision: 2 }}
-              />
-            </Col>
-            <Col span={12}>
-              <ProFormText
-                name="answer"
-                label="答案"
-                placeholder="具体选项内容"
-              />
-            </Col>
-          </Row>
-        </ProFormList>
-      </DrawerForm>
+    <>
+      <QuForm itemId={itemId} quInfo={quInfo} open={open} onOpenChange={setOpen} onChange={onFinish} />
       <List
         itemLayout="horizontal"
         dataSource={list}
-        renderItem={(item) => <QuItem qu={item} onEdit={() => onEditQu(item)}/>}
+        renderItem={(item) => (
+          <QuItem
+            qu={item}
+            onEdit={() => onEditQu(item)}
+            onDelete={() => onDeleteQu(item)}
+          />
+        )}
       />
-    </div>
+    </>
   )
 });

src/pages/locType/edit/index.jsx

@@ -46,8 +46,6 @@ export default (props) => {
     }
   }, [id]);
 
-  console.log('id', id);
-
   const onFinish = (values) => {
     startSubmit();
     console.log('locType修改id', id);

src/pages/locType/list/index.jsx

@@ -32,10 +32,6 @@ export default (props) => {
   };
 
   const columns = [
-    {
-      title: "分类ID",
-      dataIndex: "typeId",
-    },
     {
       title: "分类名称",
       dataIndex: "name",
@@ -44,10 +40,6 @@ export default (props) => {
       title: "分类描述",
       dataIndex: "desc",
     },
-    {
-      title: "排序",
-      dataIndex: "sortNo",
-    },
     {
       title: "状态",
       dataIndex: "status",
@@ -67,16 +59,6 @@ export default (props) => {
       valueType: "option",
       width: 200,
       render: (_, record) => [
-        // <Button
-        //   key={1}
-        //   style={{ padding: 0 }}
-        //   type="link"
-        //   onClick={() => {
-        //     updateStatus(record);
-        //   }}
-        // >
-        //   {record.status === 1 ? "禁用" : "启用"}
-        // </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}

src/pages/org/list/index.jsx

@@ -32,14 +32,6 @@ export default (props) => {
   };
 
   const columns = [
-    {
-      title: "机构ID",
-      dataIndex: "orgId",
-    },
-    {
-      title: "机构编码",
-      dataIndex: "orgCode",
-    },
     {
       title: "机构名称",
       dataIndex: "name",
@@ -49,11 +41,6 @@ export default (props) => {
       dataIndex: "orgPId",
     },
 
-    {
-      title: "排序",
-      dataIndex: "sortNo",
-    },
-
     {
       title: "状态",
       dataIndex: "status",
@@ -68,10 +55,6 @@ export default (props) => {
         },
       },
     },
-    {
-      title: "创建人",
-      dataIndex: "createUser",
-    },
     {
       title: "操作",
       valueType: "option",

src/utils/request.js

@@ -19,6 +19,8 @@ instance.interceptors.request.use(function (config) {
     noTip = method.toLocaleLowerCase() === 'get' ? true : false;
   }
 
+  console.log('---------------')
+
   // 在发送请求之前做些什么
   return {
     ...config,

vite.config.js

@@ -8,7 +8,7 @@ export default defineConfig({
     port: 3000,
     proxy: {
       '/api': {
-        target: 'http://192.168.89.147:9087',
+        target: 'http://localhost:9087',
         changeOrigin: true,
       },
     }