From a4452131309083dbd14ee83da6259d4ddba7b4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 1 Feb 2023 16:30:43 +0800
Subject: [PATCH] =?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/views/xm/core/xmMenu/XmEpicFeatures.vue       |  7 +------
 src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue |  7 +------
 src/views/xm/core/xmTask/XmPhase.vue              | 13 +++++++------
 src/views/xm/core/xmTask/XmPhaseSelect.vue        |  9 +++++----
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index e12678d5..bf539430 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -313,12 +313,7 @@
 				 this.pageInfo.count=true;
 				 this.getXmMenus();
 			},
-			getParams(params){
-
-				if( this.filters.key){
-					params.key="%"+this.filters.key+"%"
-				}
-
+			getParams(params){ 
 				if(this.filters.mmUser){
 					params.mmUserid=this.filters.mmUser.userid;
 				} 
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index b6ca5c59..8b6c496b 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -204,12 +204,7 @@
 				 //this.pageInfo.count=true;
 				 this.getXmMenus();
 			},
-			getParams(params){
-
-				if( this.filters.key){
-					params.key="%"+this.filters.key+"%"
-				}
-
+			getParams(params){ 
 				if(this.filters.mmUser){
 					params.mmUserid=this.filters.mmUser.userid;
 				}
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index a6f0c9bc..ac0647d3 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -348,6 +348,9 @@ export default {
     ...mapGetters(["userInfo", "roles"]), 
     tasksTreeData() {
       let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || []));
+      if(this.filters.key){
+        xmTasks=xmTasks.filter(k=>k.name.indexOf(this.filters.key)>=0)
+      }
       const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id");
       return tasksTreeData;
     },
@@ -418,8 +421,8 @@ export default {
       pageInfo: {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 100, //每页数据
-        count:true, //是否需要重新计算总记录数
+        pageSize: 500, //每页数据
+        count:false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段
         orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
@@ -584,7 +587,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      //this.pageInfo.count = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -1063,9 +1066,7 @@ export default {
       if (this.filters.skillTags && this.filters.skillTags.length > 0) {
         params.skillIds = this.filters.skillTags.map((i) => i.skillId);
       }
-      if (this.filters.key) {
-        params.key = "%" + this.filters.key + "%";
-      }
+ 
       if (this.filters.taskOut) {
         params.taskOut = this.filters.taskOut;
       }
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index d95e94cc..7c639975 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -126,6 +126,9 @@ export default {
     ...mapGetters(["userInfo", "roles"]),  
     tasksTreeData() {
       let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || []));
+      if(this.filters.key){
+        xmTasks=xmTasks.filter(k=>k.name.indexOf(this.filters.key)>=0)
+      }
       const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id");
       return tasksTreeData;
     },
@@ -313,7 +316,7 @@ export default {
       this.getXmTasks();
     },
     searchXmTasks() {
-      this.pageInfo.count = true;
+      //this.pageInfo.count = true;
       this.getXmTasks();
     },
     //获取列表 XmTask xm_task
@@ -400,9 +403,7 @@ export default {
       if (this.filters.selProject) {
         params.projectId = this.filters.selProject.id;
       } 
-      if (this.filters.key) {
-        params.key = "%" + this.filters.key + "%";
-      } 
+ 
       params.ntype='1'
       return params;
     },