From 39871bd23f7a57e2d731ef5fd5f27552f3598f9a Mon Sep 17 00:00:00 2001
From: unknown <18119604035@163.com>
Date: Wed, 6 Sep 2023 10:41:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin-log.ts                          |  4 ++
 .../adminlog/compenents/detail-dialog.tsx     | 37 ++++++++++++++-----
 src/pages/system/adminlog/index.tsx           |  9 ++---
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/api/admin-log.ts b/src/api/admin-log.ts
index 806c607..fcc7bcb 100644
--- a/src/api/admin-log.ts
+++ b/src/api/admin-log.ts
@@ -19,3 +19,7 @@ export function adminLogList(
     end_time: end_time,
   });
 }
+
+export function adminLogDetail(id: number) {
+  return client.get(`/backend/v1/admin/log/detail/${id}`, {});
+}
diff --git a/src/pages/system/adminlog/compenents/detail-dialog.tsx b/src/pages/system/adminlog/compenents/detail-dialog.tsx
index 52a68e0..1ba7099 100644
--- a/src/pages/system/adminlog/compenents/detail-dialog.tsx
+++ b/src/pages/system/adminlog/compenents/detail-dialog.tsx
@@ -1,21 +1,35 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Modal, Form } from "antd";
+import { adminLog } from "../../../../api";
 
 interface PropInterface {
-  param: string;
-  result: string;
+  id: number;
   open: boolean;
   onCancel: () => void;
 }
 
 export const AdminLogDetailDialog: React.FC<PropInterface> = ({
-  param,
+  id,
   open,
   onCancel,
-  result,
 }) => {
   const [form] = Form.useForm();
-  const [loading, setLoading] = useState(true);
+  const [param, setParam] = useState("");
+  const [result, setResult] = useState("");
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    if (open && id > 0) {
+      getDetail();
+    }
+  }, [open, id]);
+
+  const getDetail = () => {
+    adminLog.adminLogDetail(id).then((res: any) => {
+      setParam(res.data.param);
+      setResult(res.data.result);
+    });
+  };
 
   const onFinish = (values: any) => {};
 
@@ -31,18 +45,21 @@ export const AdminLogDetailDialog: React.FC<PropInterface> = ({
           centered
           forceRender
           open={true}
-          width={416}
+          width={600}
           onOk={() => onCancel()}
           onCancel={() => onCancel()}
           footer={null}
           maskClosable={false}
         >
-          <div className="mt-24">
+          <div
+            className="mt-24"
+            style={{ maxHeight: 600, overflowY: "auto", overflowX: "hidden" }}
+          >
             <Form
               form={form}
               name="adminlog-detail"
-              labelCol={{ span: 5 }}
-              wrapperCol={{ span: 19 }}
+              labelCol={{ span: 3 }}
+              wrapperCol={{ span: 21 }}
               initialValues={{ remember: true }}
               onFinish={onFinish}
               onFinishFailed={onFinishFailed}
diff --git a/src/pages/system/adminlog/index.tsx b/src/pages/system/adminlog/index.tsx
index cabde4a..fd81f57 100644
--- a/src/pages/system/adminlog/index.tsx
+++ b/src/pages/system/adminlog/index.tsx
@@ -37,9 +37,8 @@ const SystemLogPage = () => {
   const [adminName, setAdminName] = useState("");
   const [created_at, setCreatedAt] = useState<string[]>([]);
   const [createdAts, setCreatedAts] = useState<any>([]);
-  const [param, setParam] = useState("");
-  const [result, setResult] = useState("");
   const [visiable, setVisiable] = useState(false);
+  const [admId, setAdmId] = useState(0);
 
   useEffect(() => {
     getData();
@@ -131,8 +130,7 @@ const SystemLogPage = () => {
           type="link"
           className="b-link c-red"
           onClick={() => {
-            setParam(record.param);
-            setResult(record.result);
+            setAdmId(Number(record.id));
             setVisiable(true);
           }}
         >
@@ -215,8 +213,7 @@ const SystemLogPage = () => {
         />
       </div>
       <AdminLogDetailDialog
-        param={param}
-        result={result}
+        id={admId}
         open={visiable}
         onCancel={() => setVisiable(false)}
       ></AdminLogDetailDialog>

From 3d29dd89631f047129a7a16b534f9be9a888149d Mon Sep 17 00:00:00 2001
From: unknown <18119604035@163.com>
Date: Wed, 6 Sep 2023 10:59:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E8=AF=BE=E4=B8=8A=E6=9E=B6=E6=97=B6=E9=97=B4=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/compenents/update.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/course/compenents/update.tsx b/src/pages/course/compenents/update.tsx
index 485d47c..af05403 100644
--- a/src/pages/course/compenents/update.tsx
+++ b/src/pages/course/compenents/update.tsx
@@ -97,12 +97,13 @@ export const CourseUpdate: React.FC<PropInterface> = ({
         short_desc: res.data.course.short_desc,
         hasChapter: chapterType,
         published_at: res.data.course.published_at
-          ? dayjs(res.data.course.published_at, "YYYY-MM-DD HH:mm:ss")
+          ? dayjs(res.data.course.published_at)
           : "",
       });
       setType(type);
       setThumb(res.data.course.thumb);
       setInit(false);
+      console.log(dayjs(res.data.course.published_at, "YYYY-MM-DD HH:mm:ss"));
     });
   };
 
@@ -411,7 +412,7 @@ export const CourseUpdate: React.FC<PropInterface> = ({
                 <Space align="baseline" style={{ height: 32 }}>
                   <Form.Item name="published_at">
                     <DatePicker
-                    disabledDate={disabledDate}
+                      disabledDate={disabledDate}
                       format="YYYY-MM-DD HH:mm:ss"
                       style={{ width: 240 }}
                       showTime