Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/pages/checkStand/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Card } from 'antd';
+import { Button, Card, Popconfirm } from 'antd';
 import Page from '@/components/Page';
 import Wangeditor from '@/components/Wangeditor';
 import { getTaCheckStandById, putTaCheckStand } from '@/service/tacheckstand';
@@ -43,31 +43,31 @@ export default (props) => {
         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>
-        )
-      }
+        {
+          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

@@ -0,0 +1,109 @@
+import React from "react";
+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";
+
+const queryTdLocTypeList = queryTable(getTdLocType);
+
+export default (props) => {
+  const actionRef = React.useRef();
+  const navigate = useNavigate();
+
+  // const updateStatus = (user) => {
+  //   const status = user.status === 1 ? 0 : 1;
+  //   const hide = message.loading("请稍候...", 0);
+  //   updateUserStatus(user.id, status)
+  //     .then((res) => {
+  //       hide();
+  //       actionRef.current.reload();
+  //     })
+  //     .catch(() => {
+  //       hide();
+  //     });
+  // };
+  const handleDelete = (id) => {
+    if (id) {
+      deleteTdLocType(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "分类名称",
+      dataIndex: "name",
+    },
+    {
+      title: "分类描述",
+      dataIndex: "desc",
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueEnum: {
+        1: {
+          text: "正常",
+          status: "Processing",
+        },
+        0: {
+          text: "禁用",
+          status: "Error",
+        },
+      },
+    },
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, "]]");
+            navigate(`/dict/locType/edit?id=${record.typeId}`);
+          }}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.typeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      rowKey="typeId"
+      search={false}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/dict/locType/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      request={queryTdLocTypeList}
+      columns={columns}
+    />
+  );
+};

src/pages/home/components/ProblemCharts.jsx

@@ -53,10 +53,42 @@ export default (props) => {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                 { offset: 0, color: '#FB9900' },
                 { offset: 1, color: '#FFD38F' }
-              ])
+              ]),
+              // barBorderRadius: [8, 0, 0, 0]
             },
             data: res.map(x => x.value),
           }
+          // {
+          //   type: 'bar',
+          //   barWidth: '4%',
+          //   itemStyle: {
+          //     normal: {
+          //       color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+          //         offset: 0,
+          //         color: "#FCA319" // 0% 处的颜色
+          //       }, {
+          //         offset: 1,
+          //         color: "#ED8224" // 100% 处的颜色
+          //       }], false),
+          //       barBorderRadius: [0, 0, 100, 0]
+          //     }
+          //   },
+          //   barGap: 0,
+          //   data: res.map(x => x.value)
+          // }, {
+          //   type: 'pictorialBar',
+          //   itemStyle: {
+          //     borderWidth: '20%',
+          //     color: '#FEC05F'
+          //   },
+          //   symbol: 'path://M 0,0 l 120,0 l -30,60 l -120,0 z',
+          //   symbolSize: ['34%', '8'],
+          //   symbolOffset: ['-1', '-1'], // 左右 ，上下
+          //   symbolRotate: 0,
+          //   symbolPosition: 'end',
+          //   data: res.map(x => x.value),
+          //   z: 3
+          // }
         ]
       });
     }).catch(console.error);

src/pages/locType/list/index.jsx

@@ -4,6 +4,7 @@ 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 Page from "@/components/Page";
 
 const queryTdLocTypeList = queryTable(getTdLocType);
 
@@ -87,23 +88,26 @@ export default (props) => {
   ];
 
   return (
-    <ProTable
-      actionRef={actionRef}
-      rowKey="typeId"
-      search={false}
-      toolBarRender={() => [
-        <Button
-          key="1"
-          type="primary"
-          onClick={() => {
-            navigate("/dict/locType/edit");
-          }}
-        >
-          新增
-        </Button>,
-      ]}
-      request={queryTdLocTypeList}
-      columns={columns}
-    />
+    <Page>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="typeId"
+        search={false}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            onClick={() => {
+              navigate("/dict/locType/edit");
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={queryTdLocTypeList}
+        columns={columns}
+      />
+    </Page>
+
   );
 };

src/routes/routes.jsx

@@ -37,7 +37,8 @@ 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';
+import CheckStand from '@/pages/checkStand/index';
+import CheckStandList from '@/pages/checkStand/list';
 import FieldEvaluation from '@/pages/answerRecord/fieldEvaluation';
 import QuesInvestigation from '@/pages/answerRecord/QuesInvestigation';
 
@@ -206,6 +207,17 @@ export const authRoutes = [
           icon: <ScheduleOutlined />,
           permission: 'checkStand',
         },
+        childer: [
+          {
+            path: "checkStand/list",
+            element: <CheckStandList />,
+            meta: {
+              title: '测评标准列表',
+              icon: <NodeIndexOutlined />,
+              permission: 'question',
+            },
+          },
+        ]
       },
     ]
   },

vite.config.js

@@ -10,7 +10,7 @@ export default defineConfig({
     host: '0.0.0.0',
     proxy: {
       '/api': {
-        target: 'http://127.0.0.1:9087',
+        target: 'http://192.168.89.147:9087',
         // target: 'http://t.njyz.tech',
         changeOrigin: true,
       },