From 149a074b2845b1d0c8cafc1a582b0948b445ea53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Fri, 21 Mar 2025 08:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=84=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/src/Dialog.vue     |  6 +++---
 src/components/Editor/src/Editor.vue     |  2 +-
 src/utils/formatTime.ts                  | 14 +++++++-------
 src/views/system/jobinfo/JobInfoForm.vue |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 2c17995..13c5091 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -68,12 +68,12 @@ const dialogStyle = computed(() => {
     :top="top"
   >
     <template #header="{ close }">
-      <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">
+      <div class="relative  flex items-center justify-between  text-18px">
         <slot name="title">
           {{ title }}
         </slot>
         <div
-          class="absolute right-15px top-[50%] h-54px flex translate-y-[-50%] items-center justify-between"
+          class="absolute right-0px top-[50%] h-54px flex translate-y-[-50%] items-center justify-between"
         >
           <Icon
             class="is-hover cursor-pointer"
@@ -108,9 +108,9 @@ const dialogStyle = computed(() => {
     margin: 0 !important;
 
     &__header {
-      height: 54px;
       padding: 0;
       margin-right: 0 !important;
+	    margin-bottom: 20px;
     }
 
     &__body {
diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index 620b27c..2e8dab9 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -256,11 +256,11 @@ defineExpose({
 <style scoped>
 .wgEdit >>> .w-e-scroll::-webkit-scrollbar {
   width: 4px !important;
-  //height: 8px !important;
 }
 .wgEdit >>> .w-e-scroll::-webkit-scrollbar-thumb {
   background-color: #dcdfe6 !important;
   border-radius: 10px !important;
   box-shadow: none !important;
 }
+
 </style>
diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 66decf6..1236382 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -70,7 +70,7 @@ export function formatDate(date: Date, format?: string): string {
     return ''
   }
   // 日期存在，则进行格式化
-  return date ? dayjs(date).locale('zh-cn').format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
+  return date ? dayjs(date).locale('zh-cn').format(format ?? 'YYYY年M月D日 H时m分s秒') : ''
 }
 
 /**
@@ -111,7 +111,7 @@ export function getWeek(dateTime: Date): number {
  * @description param 3天：   60 * 60* 24 * 1000 * 3
  * @returns 返回拼接后的时间字符串
  */
-export function formatPast(param: string | Date, format = 'YYYY-MM-DD HH:mm:ss'): string {
+export function formatPast(param: string | Date, format = 'YYYY年M月D日 H时m分s秒'): string {
   // 传入格式处理、存储转换值
   let t: any, s: number
   // 获取js 时间戳
@@ -199,7 +199,7 @@ export function formatPast2(ms: number): string {
  * @param cellValue 字段值
  */
 export function dateFormatter(_row: any, _column: TableColumnCtx<any>, cellValue: any): string {
-  return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日 AHH时mm分') : ''
+  return cellValue ? formatDate(cellValue, 'YYYY年M月D日 AH时m分') : ''
 }
 
 /**
@@ -210,7 +210,7 @@ export function dateFormatter(_row: any, _column: TableColumnCtx<any>, cellValue
  * @param cellValue 字段值
  */
 export function dateFormatter2(_row: any, _column: TableColumnCtx<any>, cellValue: any): string {
-  return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日') : ''
+  return cellValue ? formatDate(cellValue, 'YYYY年M月D日') : ''
 }
 
 /**
@@ -221,7 +221,7 @@ export function dateFormatter2(_row: any, _column: TableColumnCtx<any>, cellValu
  * @param cellValue 字段值
  */
 export function dateFormatter3(_row: any, _column: TableColumnCtx<any>, cellValue: any): string {
-  return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日') : ''
+  return cellValue ? formatDate(cellValue, 'YYYY年M月D日') : ''
 }
 
 /**
@@ -338,7 +338,7 @@ export function getDateRange(
   endDate: dayjs.ConfigType
 ): [string, string] {
   return [
-    dayjs(beginDate).startOf('d').format('YYYY-MM-DD HH:mm:ss'),
-    dayjs(endDate).endOf('d').format('YYYY-MM-DD HH:mm:ss')
+    dayjs(beginDate).startOf('d').format('YYYY年M月D日 H时m分s秒'),
+    dayjs(endDate).endOf('d').format('YYYY年M月D日 H时m分s秒')
   ]
 }
diff --git a/src/views/system/jobinfo/JobInfoForm.vue b/src/views/system/jobinfo/JobInfoForm.vue
index 5b9fefd..1d1d482 100644
--- a/src/views/system/jobinfo/JobInfoForm.vue
+++ b/src/views/system/jobinfo/JobInfoForm.vue
@@ -1,11 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" top="5vh">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" top="5vh" width="64vw">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
       v-loading="formLoading"
-      width="600px"
       class="reportForm"
     >
       <section class="flex flex-wrap gap-20px">
@@ -26,7 +25,7 @@
           <el-input v-model="formData.jobName" placeholder="请输入汇报人姓名" />
         </el-form-item>
         <el-form-item label="汇报内容" prop="content" class="!w100%">
-          <Editor v-model="formData.content" height="350px" />
+          <Editor v-model="formData.content" height="400px" class="w100%"/>
         </el-form-item>
       </section>
     </el-form>
@@ -162,6 +161,7 @@ const deleteReport = () => {
 .reportForm {
   ::v-deep(.el-form-item) {
     width: calc(50% - 10px);
+	  margin-bottom: 0;
   }
 }
 </style>