src/pages/checkStand/edit/index.jsx

@@ -0,0 +1,78 @@
+import React from "react";
+import { Button, Card, Popconfirm } from "antd";
+import { useSearchParams } from "react-router-dom";
+import Page from "@/components/Page";
+import Wangeditor from "@/components/Wangeditor";
+import { getTaCheckStandById, putTaCheckStand } from "@/service/tacheckstand";
+
+export default (props) => {
+  const [loading, setLoading] = React.useState(false);
+  const [editable, setEditAble] = React.useState(false);
+  const [detail, setDetail] = React.useState(false);
+
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+
+  const onChange = (e) => {
+    setDetail({
+      ...(detail || {}),
+      content: e,
+    });
+  };
+
+  const onSubmit = (e) => {
+    setLoading(true);
+    putTaCheckStand(id, detail)
+      .then(() => {
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  };
+
+  React.useEffect(() => {
+    setLoading(true);
+    getTaCheckStandById(id)
+      .then((res) => {
+        setDetail(res);
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  }, []);
+
+  return (
+    <Page>
+      <Card
+        loading={loading}
+        extra={
+          <Button type="primary" onClick={onSubmit}>
+            提交
+          </Button>
+        }
+      >
+        <Wangeditor
+          value={detail?.content}
+          toolbarConfig={{
+            toolbarKeys: [
+              "headerSelect",
+              "blockquote",
+              "|",
+              "bold",
+              "underline",
+              "italic",
+              "color",
+              "fontSize",
+              "|",
+              "bulletedList",
+              "numberedList",
+            ],
+          }}
+          onChange={onChange}
+        />
+      </Card>
+    </Page>
+  );
+};

src/pages/checkStand/index.jsx

@@ -1,74 +0,0 @@
-import React from 'react';
-import { Button, Card, Popconfirm } from 'antd';
-import Page from '@/components/Page';
-import Wangeditor from '@/components/Wangeditor';
-import { getTaCheckStandById, putTaCheckStand } from '@/service/tacheckstand';
-
-export default (props) => {
-
-  const [loading, setLoading] = React.useState(false);
-  const [editable, setEditAble] = React.useState(false);
-  const [detail, setDetail] = React.useState(false);
-
-  const onChange = (e) => {
-    setDetail({
-      ...detail || {},
-      content: e,
-    })
-  }
-
-  const onSubmit = (e) => {
-    setLoading(true);
-    putTaCheckStand(1, detail).then(() => {
-      setLoading(false);
-      setEditAble(false);
-    }).catch(() => {
-      setLoading(false);
-    })
-  }
-
-  React.useEffect(() => {
-    setLoading(true);
-    getTaCheckStandById(1).then((res) => {
-      setDetail(res);
-      setLoading(false);
-    }).catch(() => {
-      setLoading(false);
-    })
-  }, []);
-
-  return (
-    <Page>
-      <Card loading={loading} extra={(
-        editable ? <Button type="primary" onClick={onSubmit}>提交</Button>
-          : <Button type="primary" onClick={() => setEditAble(true)}>编辑</Button>
-      )}>
-        {
-          editable ? (
-            <Wangeditor
-              value={detail?.content}
-              toolbarConfig={{
-                toolbarKeys: [
-                  'headerSelect',
-                  'blockquote',
-                  '|',
-                  'bold',
-                  'underline',
-                  'italic',
-                  'color',
-                  'fontSize',
-                  '|',
-                  'bulletedList',
-                  'numberedList',
-                ]
-              }}
-              onChange={onChange}
-            />
-          ) : (
-            <div dangerouslySetInnerHTML={{ __html: detail?.content }}></div>
-          )
-        }
-      </Card>
-    </Page>
-  )
-}

src/pages/checkStand/list/index.jsx

@@ -3,9 +3,9 @@ import { useNavigate } from "react-router-dom";
 import { queryTable } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import { Button, message, Popconfirm } from "antd";
-import { getTdLocType, deleteTdLocType } from "@/service/tdloctype";
+import { getTaCheckStand } from "@/service/tacheckstand";
 
-const queryTdLocTypeList = queryTable(getTdLocType);
+const queryTaCheckStandList = queryTable(getTaCheckStand);
 
 export default (props) => {
   const actionRef = React.useRef();
@@ -34,26 +34,13 @@ export default (props) => {
   const columns = [
     {
       title: "分类名称",
-      dataIndex: "name",
+      dataIndex: "locName",
     },
     {
       title: "分类描述",
       dataIndex: "desc",
     },
-    {
-      title: "状态",
-      dataIndex: "status",
-      valueEnum: {
-        1: {
-          text: "正常",
-          status: "Processing",
-        },
-        0: {
-          text: "禁用",
-          status: "Error",
-        },
-      },
-    },
+
     {
       title: "操作",
       valueType: "option",
@@ -64,24 +51,11 @@ export default (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            console.log(record, "]]");
-            navigate(`/dict/locType/edit?id=${record.typeId}`);
+            navigate(`/dict/checkStand/edit?id=${record.statndId}`);
           }}
         >
           编辑
         </Button>,
-        <Popconfirm
-          key={3}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.typeId)}
-          okText="确定"
-          cancelText="取消"
-        >
-          {/* manualPush */}
-          <Button style={{ padding: 0 }} type="link">
-            删除
-          </Button>
-        </Popconfirm>,
       ],
     },
   ];
@@ -89,20 +63,20 @@ export default (props) => {
   return (
     <ProTable
       actionRef={actionRef}
-      rowKey="typeId"
+      rowKey="statndId"
       search={false}
-      toolBarRender={() => [
-        <Button
-          key="1"
-          type="primary"
-          onClick={() => {
-            navigate("/dict/locType/edit");
-          }}
-        >
-          新增
-        </Button>,
-      ]}
-      request={queryTdLocTypeList}
+      // toolBarRender={() => [
+      //   <Button
+      //     key="1"
+      //     type="primary"
+      //     onClick={() => {
+      //       navigate("/dict/locType/edit");
+      //     }}
+      //   >
+      //     新增
+      //   </Button>,
+      // ]}
+      request={queryTaCheckStandList}
       columns={columns}
     />
   );

src/routes/routes.jsx

@@ -12,20 +12,20 @@ import {
   NotificationOutlined,
   ScheduleOutlined,
   FileTextOutlined,
-  HddOutlined
-} from '@ant-design/icons';
-import { Outlet } from 'react-router-dom';
+  HddOutlined,
+} from "@ant-design/icons";
+import { Outlet } from "react-router-dom";
 import AuthLayout from "@/layouts/AuthLayout";
-import Login from '@/pages/login';
-import Page404 from '@/pages/404';
-import Role from '@/pages/role/index';
-import User from '@/pages/user/index';
-import UserEdit from '@/pages/user/Edit';
-import CheckList from '@/pages/check';
-import CheckEdit from '@/pages/check/Edit';
+import Login from "@/pages/login";
+import Page404 from "@/pages/404";
+import Role from "@/pages/role/index";
+import User from "@/pages/user/index";
+import UserEdit from "@/pages/user/Edit";
+import CheckList from "@/pages/check";
+import CheckEdit from "@/pages/check/Edit";
 import OrgList from "@/pages/org/index";
 
-import Index from '@/pages/home/index';
+import Index from "@/pages/home/index";
 
 import PositionList from "@/pages/position/list";
 import PositionEdit from "@/pages/position/edit";
@@ -34,13 +34,14 @@ import LocTypeEdit from "@/pages/locType/edit";
 import IssueTypeList from "@/pages/issueType/list";
 import IssueTypeEdit from "@/pages/issueType/edit";
 import QuestionList from "@/pages/question/list";
-import IssueList from '@/pages/issue';
-import IssueDetail from '@/pages/issue/detail';
-import Notice from '@/pages/notice';
-import CheckStand from '@/pages/checkStand/index';
-import CheckStandList from '@/pages/checkStand/list';
-import FieldEvaluation from '@/pages/answerRecord/fieldEvaluation';
-import QuesInvestigation from '@/pages/answerRecord/QuesInvestigation';
+import IssueList from "@/pages/issue";
+import IssueDetail from "@/pages/issue/detail";
+import Notice from "@/pages/notice";
+
+import CheckStandList from "@/pages/checkStand/list";
+import CheckStandEdit from "@/pages/checkStand/edit";
+import FieldEvaluation from "@/pages/answerRecord/fieldEvaluation";
+import QuesInvestigation from "@/pages/answerRecord/QuesInvestigation";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -61,45 +62,45 @@ export const authRoutes = [
     path: "",
     element: <Outlet />,
     meta: {
-      title: '业务管理',
-      menuType: 'group',
-      permission: 'biz',
+      title: "业务管理",
+      menuType: "group",
+      permission: "biz",
     },
     children: [
       {
         path: "notice",
         element: <Notice />,
         meta: {
-          title: '通知公告',
+          title: "通知公告",
           icon: <NotificationOutlined />,
-          permission: 'notice',
-        }
+          permission: "notice",
+        },
       },
       {
         path: "issue",
         element: <IssueList />,
         meta: {
-          title: '问 题 单',
+          title: "问 题 单",
           icon: <CommentOutlined />,
-          permission: 'issue',
-        }
+          permission: "issue",
+        },
       },
       {
         path: "issue/detail",
         element: <IssueDetail />,
         meta: {
-          title: '问题单详情',
+          title: "问题单详情",
           hideInMenu: true,
-          permission: 'issue.detail',
-        }
+          permission: "issue.detail",
+        },
       },
       {
         path: "check",
         element: <CheckList />,
         meta: {
-          title: '模拟测评',
+          title: "模拟测评",
           icon: <ProjectOutlined />,
-          permission: 'check',
+          permission: "check",
         },
       },
       {
@@ -107,37 +108,36 @@ export const authRoutes = [
         element: <CheckEdit />,
         meta: {
           hideInMenu: true,
-          title: '模拟测评维护',
+          title: "模拟测评维护",
           icon: <ProjectOutlined />,
-          permission: 'check.edit',
-        }
+          permission: "check.edit",
+        },
       },
       {
         path: "answerRecord",
         element: <Outlet />,
         meta: {
-          title: '答题记录',
+          title: "答题记录",
           icon: <FileTextOutlined />,
         },
-        children:
-          [
-            {
-              path: "answerRecord/fieldEvaluation",
-              element: <FieldEvaluation />,
-              meta: {
-                title: '实地测评',
-                icon: <HddOutlined />,
-              }
+        children: [
+          {
+            path: "answerRecord/fieldEvaluation",
+            element: <FieldEvaluation />,
+            meta: {
+              title: "实地测评",
+              icon: <HddOutlined />,
             },
-            {
-              path: "answerRecord/quesInvestigation",
-              element: <QuesInvestigation />,
-              meta: {
-                title: '问卷调查',
-                icon: <HddOutlined />,
-              }
+          },
+          {
+            path: "answerRecord/quesInvestigation",
+            element: <QuesInvestigation />,
+            meta: {
+              title: "问卷调查",
+              icon: <HddOutlined />,
             },
-          ]
+          },
+        ],
       },
     ],
   },
@@ -145,19 +145,19 @@ export const authRoutes = [
     path: "dict",
     element: <Outlet />,
     meta: {
-      title: '基础字典',
+      title: "基础字典",
       icon: <ProjectOutlined />,
-      menuType: 'group',
-      permission: 'dict',
+      menuType: "group",
+      permission: "dict",
     },
     children: [
       {
         path: "locType/list",
         element: <LocTypeList />,
         meta: {
-          title: '点位分类',
+          title: "点位分类",
           icon: <EnvironmentOutlined />,
-          permission: 'locType',
+          permission: "locType",
         },
       },
       {
@@ -165,9 +165,9 @@ export const authRoutes = [
         element: <LocTypeEdit />,
         meta: {
           hideInMenu: true,
-          title: '点位分类编辑',
+          title: "点位分类编辑",
           // icon: <AppstoreOutlined />,
-          permission: 'locType.edit',
+          permission: "locType.edit",
         },
       },
 
@@ -175,9 +175,9 @@ export const authRoutes = [
         path: "issueType/list",
         element: <IssueTypeList />,
         meta: {
-          title: '问题分类',
+          title: "问题分类",
           icon: <BranchesOutlined />,
-          permission: 'issueType',
+          permission: "issueType",
         },
       },
       {
@@ -185,96 +185,94 @@ export const authRoutes = [
         element: <IssueTypeEdit />,
         meta: {
           hideInMenu: true,
-          title: '问题分类编辑',
+          title: "问题分类编辑",
           // icon: <AppstoreOutlined />,
-          permission: 'issueType.edit',
+          permission: "issueType.edit",
         },
       },
       {
         path: "question/list",
         element: <QuestionList />,
         meta: {
-          title: '题库管理',
+          title: "题库管理",
           icon: <NodeIndexOutlined />,
-          permission: 'question',
+          permission: "question",
         },
       },
       {
-        path: "checkStand",
-        element: <CheckStand />,
+        path: "checkStand/list",
+        element: <CheckStandList />,
         meta: {
-          title: '测评标准',
+          title: "测评标准",
           icon: <ScheduleOutlined />,
-          permission: 'checkStand',
+          permission: "checkStand",
+        },
+      },
+      {
+        path: "checkStand/edit",
+        element: <CheckStandEdit />,
+        meta: {
+          title: "测评标准",
+          hideInMenu: true,
+          permission: "checkStand",
         },
-        childer: [
-          {
-            path: "checkStand/list",
-            element: <CheckStandList />,
-            meta: {
-              title: '测评标准列表',
-              icon: <NodeIndexOutlined />,
-              permission: 'question',
-            },
-          },
-        ]
       },
-    ]
+    ],
   },
   {
     path: "system",
     element: <Outlet />,
     meta: {
-      title: '系统管理',
+      title: "系统管理",
       icon: <SettingOutlined />,
-      menuType: 'group',
-      permission: 'system',
+      menuType: "group",
+      permission: "system",
     },
     children: [
       {
         path: "user",
         element: <User />,
         meta: {
-          title: '人员管理',
+          title: "人员管理",
           icon: <TeamOutlined />,
-          permission: 'user',
+          permission: "user",
         },
       },
       {
         path: "user/edit",
         element: <UserEdit />,
         meta: {
-          title: '人员维护',
+          title: "人员维护",
           hideInMenu: true,
           // icon: <AppstoreOutlined />,
-          permission: 'user.edit',
+          permission: "user.edit",
         },
       },
       {
         path: "role",
         element: <Role />,
         meta: {
-          title: '角色管理',
+          title: "角色管理",
           icon: <UsergroupAddOutlined />,
-          permission: 'role',
+          permission: "role",
         },
       },
       {
         path: "org",
         element: <OrgList />,
         meta: {
-          title: '机构管理',
+          title: "机构管理",
           icon: <BankOutlined />,
-          permission: 'org',
+          permission: "org",
         },
       },
       {
         path: "position/list",
         element: <PositionList />,
         meta: {
-          title: '岗位管理',
+          title: "岗位管理",
           icon: <GoldOutlined />,
-          permission: 'position',
+          permission: "position",
         },
       },
       {
@@ -282,12 +280,12 @@ export const authRoutes = [
         element: <PositionEdit />,
         meta: {
           hideInMenu: true,
-          title: '岗位管理编辑',
+          title: "岗位管理编辑",
           // icon: <AppstoreOutlined />,
-          permission: 'position.edit',
+          permission: "position.edit",
         },
       },
-    ]
+    ],
   },
 ];
 
@@ -301,22 +299,22 @@ export const defaultRoutes = [
         element: <Index />,
       },
       {
-        path: '*',
-        element: <Page404 />
-      }
+        path: "*",
+        element: <Page404 />,
+      },
     ],
   },
   {
-    path: '/login',
+    path: "/login",
     element: <Login />,
   },
   {
-    path: '*',
-    element: <Page404 />
-  }
-]
+    path: "*",
+    element: <Page404 />,
+  },
+];
 
-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);
@@ -325,7 +323,7 @@ export function mergeAuthRoutes (r1, 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, "/");

vite.config.js

@@ -1,28 +1,24 @@
-import { defineConfig } from 'vite'
-import path from "path"
-import react from '@vitejs/plugin-react'
+import { defineConfig } from "vite";
+import path from "path";
+import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: '',
+  base: "",
   server: {
     port: 3001,
-    host: '0.0.0.0',
+    host: "0.0.0.0",
     proxy: {
-      '/api': {
-        target: 'http://192.168.89.147:9087',
+      "/api": {
+        target: "http://192.168.89.147:9087",
         // target: 'http://t.njyz.tech',
         changeOrigin: true,
       },
-    }
+    },
   },
-  plugins: [
-    react(),
-  ],
+  plugins: [react()],
   resolve: {
-    alias: [
-      { find: '@', replacement: path.resolve(__dirname, 'src') },
-    ],
+    alias: [{ find: "@", replacement: path.resolve(__dirname, "src") }],
   },
   css: {
     preprocessorOptions: {
@@ -32,4 +28,4 @@ export default defineConfig({
       },
     },
   },
-})
+});