From 60dc9ffcf71470e3bd3aeb6d48a67f48089c815c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 01:23:01 +0800
Subject: [PATCH 1/4] -- bug

---
 src/components/student/CommonStudent.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 34f5575b..4839bd3d 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -654,6 +654,7 @@ const deleteDepSelect = () => {
 //重置受众
 const resetAudienceInfo = () => {
   audienceName.value = { keyword: "", page: 1, pageSize: 10 };
+  searchStu();
 };
 //全部清除
 // const deleteAll = () => {

From 072a9cab52122c63025cac4b7fe6e017584619dd Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Mon, 26 Dec 2022 08:35:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue  | 14 ++++++++------
 src/views/projectcenter/ProjectManage.vue |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 4839bd3d..73d233b3 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -637,16 +637,18 @@ const auditChangePagination = (page) => {
   audienceName.value.page = page;
   searchAudi();
 };
-//重置
+//重置 清空页面上的搜索记录
 const resetStu = () => {
-  deleteDepSelect();
-  nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
+  //deleteDepSelect();
+  nameSearch.value = { keyword: "", page: 1, pageSize: 10, departId: null,};
+  stuData.value = [];
+  stuSelectKeys.value =[];
 
 };
 //清空选择部门信息
-const deleteDepSelect = () => {
-  stuSelectKeys.value = [];
-};
+//const deleteDepSelect = () => {
+ // stuSelectKeys.value = [];
+//};
 //重置组织
 // const resetOrg = () => {
 //   searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a67c921f..a0d160ff 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -45,6 +45,7 @@
         </div>
         <div class="select addTimeBox">
           <div class="addTime">创建时间：</div>
+          <!--
           <a-range-picker
               :show-time="{ format: 'HH:mm' }"
               :disabled-date="disabledDate" :disabled-time="disabledRangeTime" 
@@ -53,7 +54,9 @@
               style="border-radius: 8px; height: 40px; margin-left: 5px"
               :placeholder="['      开始时间', '        结束时间']"
 
-          />
+          />-->
+          <a-range-picker v-model:value="searchParam.valueDate" style="width: 420px" format="YYYY-MM-DD" separator="至"
+								:placeholder="['      开始时间', '        结束时间']" />
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">

From 44c8d7e43fc320cca2ecf9a417fb38d73ad58144 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Mon, 26 Dec 2022 08:54:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 73d233b3..4839bd3d 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -637,18 +637,16 @@ const auditChangePagination = (page) => {
   audienceName.value.page = page;
   searchAudi();
 };
-//重置 清空页面上的搜索记录
+//重置
 const resetStu = () => {
-  //deleteDepSelect();
-  nameSearch.value = { keyword: "", page: 1, pageSize: 10, departId: null,};
-  stuData.value = [];
-  stuSelectKeys.value =[];
+  deleteDepSelect();
+  nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
 
 };
 //清空选择部门信息
-//const deleteDepSelect = () => {
- // stuSelectKeys.value = [];
-//};
+const deleteDepSelect = () => {
+  stuSelectKeys.value = [];
+};
 //重置组织
 // const resetOrg = () => {
 //   searchOrgName.value = {keyword: '', page: 1, pageSize: 10}

From 4fb7fe59ed782f4bba0b9b7529cc8c56a2f97b75 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 09:10:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?--=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 7c212efc..359b7015 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本1.05------------");
+    console.log("版本1.06------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });