From b16d8a6128d3140bf83aa25449c186a2869d83ec Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 14 Aug 2024 14:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/base/module/support/job/core/SmartJobExecutor.java     | 2 ++
 .../src/components/framework/wangeditor/index.vue             | 1 -
 .../src/views/system/account/components/message/index.vue     | 2 +-
 .../src/views/system/menu/components/menu-operate-modal.vue   | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
index c2508af9..721410a8 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
@@ -142,6 +142,8 @@ public class SmartJobExecutor implements Runnable {
         logEntity.setSuccessFlag(true);
         // 执行开始时间
         logEntity.setExecuteStartTime(executeTime);
+        logEntity.setExecuteEndTime(executeTime);
+        logEntity.setExecuteTimeMillis(0L);
         logEntity.setCreateName(executorName);
         logEntity.setIp(SmartIpUtil.getLocalFirstIp());
         logEntity.setProcessId(SmartJobUtil.getProcessId());
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
index 6da8f0ab..2ecdeac6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
@@ -61,7 +61,6 @@
   watch(
     () => props.modelValue,
     (nVal) => {
-      console.log(nVal);
       editorHtml.value = nVal;
     },
     {
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
index da4dc552..4156bccb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
@@ -6,7 +6,7 @@
       </a-form-item>
 
       <a-form-item label="类型" class="smart-query-form-item">
-        <smart-enum-select v-model:value="queryForm.messageType" placeholder="消息类型" enum-name="MESSAGE_TYPE_ENUM" />
+        <smart-enum-select style="width: 150px" v-model:value="queryForm.messageType" placeholder="消息类型" enum-name="MESSAGE_TYPE_ENUM" />
       </a-form-item>
 
       <a-form-item label="消息时间" class="smart-query-form-item">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
index b6f740ae..2cee271b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
@@ -61,7 +61,7 @@
           <a-switch v-model:checked="form.visibleFlag" checked-children="显示" un-checked-children="不显示" />
         </a-form-item>
         <a-form-item label="禁用状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
       </template>
       <!--      目录 菜单 end   -->
@@ -74,7 +74,7 @@
           <MenuTreeSelect ref="contextMenuTreeSelect" v-model:value="form.contextMenuId" />
         </a-form-item>
         <a-form-item label="功能点状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
         <a-form-item label="权限类型" name="permsType">
           <a-radio-group v-model:value="form.permsType">