From 861bc810f9d51860abdafb8fd64e60dc97599541 Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Fri, 20 May 2022 19:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuiYan/pricetasklogController.cs          |  3 +++
 .../HuiYan/pricetasklogBusiness.cs            |  6 +++---
 .../HuiYan/teamitemsBusiness.cs               |  5 ++---
 .../HuiYan/IpricetasklogBusiness.cs           |  2 ++
 .../vuepage/client/src/views/items/Index.vue  | 20 +++++++++++++------
 .../client/src/views/pricetask/Index.vue      | 18 ++++++++++++-----
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/Coldairarrow.Api/Controllers/HuiYan/pricetasklogController.cs b/src/Coldairarrow.Api/Controllers/HuiYan/pricetasklogController.cs
index aeca41b..052b517 100644
--- a/src/Coldairarrow.Api/Controllers/HuiYan/pricetasklogController.cs
+++ b/src/Coldairarrow.Api/Controllers/HuiYan/pricetasklogController.cs
@@ -155,5 +155,8 @@ namespace Coldairarrow.Api.Controllers.HuiYan
         {
             return _pricetasklogBus.AcceptTask(teamItemId);
         }
+
+
+
     }
 }
\ No newline at end of file
diff --git a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
index e7cb8ec..d31677d 100644
--- a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
+++ b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
@@ -75,9 +75,8 @@ namespace Coldairarrow.Business.HuiYan
 
         public AjaxResult GetTaskCount()
         {
-            var list = Db.GetIQueryable<pricetasklog>().Where(c => c.UserId == _operator.UserId).Select(c => c.State);
-
-            return Success(list);
+            var list = Db.GetIQueryable<pricetasklog>().Where(c => c.UserId == _operator.UserId).Select(c => c.State).ToList();
+            return Success(list.GroupBy(c => c).Select(c=>new {Id= c.Key,Count=c.Count() }));
         }
 
 
@@ -234,6 +233,7 @@ namespace Coldairarrow.Business.HuiYan
             return Error(result.ex.Message);
         }
 
+
         public AjaxResult AcceptTask(string teamItemId)
         {
             var teamItem = Db.GetIQueryable<teamitems>().FirstOrDefault(c => c.Id == teamItemId);
diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
index a1ce396..99cd319 100644
--- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
+++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
@@ -72,9 +72,8 @@ namespace Coldairarrow.Business.HuiYan
 
         public AjaxResult GetTeamCount()
         {
-            var list= Db.GetIQueryable<teamitems>().Where(c => c.TeamId == _operator.TeamId).Select(c => c.State);
-
-            return Success(list);
+            var list= Db.GetIQueryable<teamitems>().Where(c => c.TeamId == _operator.TeamId).Select(c => c.State).ToList();
+            return Success(list.GroupBy(c => c).Select(c => new { Id = c.Key, Count = c.Count() }));
         }
 
         public PageResult<TeamitemDto> GetItems(PageInput<ConditionDTO> input, string keyWord)
diff --git a/src/Coldairarrow.IBusiness/HuiYan/IpricetasklogBusiness.cs b/src/Coldairarrow.IBusiness/HuiYan/IpricetasklogBusiness.cs
index 786f37a..bb1a82c 100644
--- a/src/Coldairarrow.IBusiness/HuiYan/IpricetasklogBusiness.cs
+++ b/src/Coldairarrow.IBusiness/HuiYan/IpricetasklogBusiness.cs
@@ -25,5 +25,7 @@ namespace Coldairarrow.Business.HuiYan
         AjaxResult DayTaskSet();
 
         AjaxResult AcceptTask(string teamItemId);
+
+
     }
 }
\ No newline at end of file
diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
index 8775f02..f4b4ece 100644
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
@@ -3,32 +3,32 @@
     <a-tabs @change="changeTab">
       <a-tab-pane
         key="0"
-        :tab="'待比价（' + stateList.filter((c) => c == 0).length + '）'"
+        :tab="'待比价（' + getTaskCount(0) + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="6"
-        :tab="'已比价（' + stateList.filter((c) => c == 6).length + '）'"
+        :tab="'已比价（' + getTaskCount(6)  + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="1"
-        :tab="'精选（' + stateList.filter((c) => c == 1).length + '）'"
+        :tab="'精选（' + getTaskCount(1)  + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="8"
-        :tab="'待上架（' + stateList.filter((c) => c == 8).length + '）'"
+        :tab="'待上架（' + getTaskCount(8)  + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="2"
-        :tab="'已上架（' + stateList.filter((c) => c == 2).length + '）'"
+        :tab="'已上架（' +getTaskCount(2) + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="3"
-        :tab="'放弃（' + stateList.filter((c) => c == 3).length + '）'"
+        :tab="'放弃（' + getTaskCount(3)  + '）'"
       >
       </a-tab-pane>
     </a-tabs>
@@ -603,6 +603,14 @@ export default {
         this.stateList = res.Data;
       });
     },
+    getTaskCount(id){
+      var task= this.stateList.find(c=>c.Id==id)
+      if(task==null||task==undefined)
+      {
+        return 0
+      }
+      return task.Count
+    },
     getImgPath(img) {
       if (!img||img==undefined) return;
 
diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
index 1fbf77c..832882e 100644
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
@@ -8,22 +8,22 @@
       </a-tab-pane>
       <a-tab-pane
         key="0"
-        :tab="'待比价（' + stateList.filter((c) => c == 0).length + '）'"
+        :tab="'待比价（' + getTaskCount(0) + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="1"
-        :tab="'已比价（' + stateList.filter((c) => c == 1).length + '）'"
+        :tab="'已比价（' + getTaskCount(1) + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="2"
-        :tab="'待修改（' + stateList.filter((c) => c == 2).length + '）'"
+        :tab="'待修改（' + getTaskCount(2) + '）'"
       >
       </a-tab-pane>
       <a-tab-pane
         key="3"
-        :tab="'已完结（' + stateList.filter((c) => c == 3).length + '）'"
+        :tab="'已完结（' + getTaskCount(3) + '）'"
       >
       </a-tab-pane>
     </a-tabs>
@@ -561,9 +561,16 @@ export default {
     getTabCount() {
       this.http.get("/HuiYan/pricetasklog/GetTaskCount").then((res) => {
         this.stateList = res.Data;
-        console.log(this.stateList);
       });
     },
+    getTaskCount(id){
+      var task= this.stateList.find(c=>c.Id==id)
+      if(task==null||task==undefined)
+      {
+        return 0
+      }
+      return task.Count
+    },
     getImgPath(img) {
       if (!img || img == undefined) return;
       if (img.indexOf("http") >= 0) {
@@ -597,6 +604,7 @@ export default {
       this.getDatas(e);
       this.currentTab = e;
       this.pagination.current = 1;
+      this.getTabCount();
     },
     searchDatas() {
       this.pagination.current = 1;