From 15cc4a9003580a22f9b56c4e6e4e6bfa3cf407f4 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 11:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=A5=E4=BD=9C=E6=B7=BB=E5=8A=A0=E4=B8=8E?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0star=E7=9A=84=E7=A7=BB=E5=8A=A8=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../to-be-done-card/home-to-be-done.vue       | 15 ++++++++----
 .../to-be-done-card/to-be-done-modal.vue      | 24 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
index c6f1a5a5..c9920cb7 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
@@ -1,5 +1,5 @@
 <!--
-  * 已办/代办
+  * 待办工作
   * 
   * @Author:    1024创新实验室-主任：卓大 
   * @Date:      2022-09-12 22:34:00
@@ -70,16 +70,21 @@
 
   function handleCheckbox(e) {
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 
   function itemStar(data) {
     data.starFlag = !data.starFlag;
+    // 将取消 star 的删除掉
     const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
     toBeDoneList.value.splice(index, 1);
     if (data.starFlag) {
+      // 最新添加标记star的移动到第一位
       toBeDoneList.value.unshift(data);
     } else {
-      toBeDoneList.value.push(data);
+      // 取消标记star的移动到最后一个标记 star 的后面添加
+      const lastStarIndex = toBeDoneList.value.findLastIndex((item) => item.starFlag);
+      toBeDoneList.value.splice(lastStarIndex + 1, 0, data);
     }
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
   }
@@ -94,9 +99,9 @@
 
   // 添加待办工作
   function addToBeDone(data) {
-    toBeDoneList.value.unshift(data);
-    useUserStore().toBeDoneCount = toBeDoneList.value.length;
+    toBeDoneList.value.push(data);
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 
   function toDelete(data) {
@@ -121,8 +126,8 @@
   function deleteToBeDone(data) {
     const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
     toBeDoneList.value.splice(index, 1);
-    useUserStore().toBeDoneCount = toBeDoneList.value.length;
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 </script>
 <style lang="less" scoped>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
index a8054944..1718e7ae 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
@@ -1,15 +1,17 @@
 <template>
-  <a-modal v-model:open="visible" title="新建待办" @close="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules">
-      <a-form-item label="标题" name="title">
-        <a-input v-model:value="form.title" placeholder="请输入标题" />
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-button @click="onClose">取消</a-button>
-      <a-button type="primary" @click="onSubmit">确定</a-button>
-    </template>
-  </a-modal>
+  <div>
+    <a-modal v-model:open="visible" title="新建待办" @close="onClose">
+      <a-form ref="formRef" :model="form" :rules="rules">
+        <a-form-item label="标题" name="title">
+          <a-input v-model:value="form.title" placeholder="请输入标题" />
+        </a-form-item>
+      </a-form>
+      <template #footer>
+        <a-button @click="onClose">取消</a-button>
+        <a-button type="primary" @click="onSubmit">确定</a-button>
+      </template>
+    </a-modal>
+  </div>
 </template>
 <script setup>
   import { reactive, ref } from 'vue';