修复类型不正确导致颜色不显示

src/Coldairarrow.Api/Controllers/HuiYan/teamcattimeController.cs

@@ -0,0 +1,65 @@
+using Coldairarrow.Business.HuiYan;
+using Coldairarrow.Entity.HuiYan;
+using Coldairarrow.Util;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Coldairarrow.Api.Controllers.HuiYan
+{
+    [Route("/HuiYan/[controller]/[action]")]
+    public class teamcattimeController : BaseApiController
+    {
+        #region DI
+
+        public teamcattimeController(IteamcattimeBusiness teamcattimeBus)
+        {
+            _teamcattimeBus = teamcattimeBus;
+        }
+
+        IteamcattimeBusiness _teamcattimeBus { get; }
+
+        #endregion
+
+        #region 获取
+
+        [HttpPost]
+        public async Task<PageResult<teamcattime>> GetDataList(PageInput<ConditionDTO> input)
+        {
+            return await _teamcattimeBus.GetDataListAsync(input);
+        }
+
+        [HttpPost]
+        public async Task<teamcattime> GetTheData(IdInputDTO input)
+        {
+            return await _teamcattimeBus.GetTheDataAsync(input.id);
+        }
+
+        #endregion
+
+        #region 提交
+
+        [HttpPost]
+        public async Task SaveData(teamcattime data)
+        {
+            if (data.Id.IsNullOrEmpty())
+            {
+                InitEntity(data);
+
+                await _teamcattimeBus.AddDataAsync(data);
+            }
+            else
+            {
+                await _teamcattimeBus.UpdateDataAsync(data);
+            }
+        }
+
+        [HttpPost]
+        public async Task DeleteData(List<string> ids)
+        {
+            await _teamcattimeBus.DeleteDataAsync(ids);
+        }
+
+        #endregion
+    }
+}

src/Coldairarrow.Api/Startup.cs

@@ -6,9 +6,11 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using NSwag;
+using System.IO.Compression;
 using System.Linq;
 
 namespace Coldairarrow.Api
@@ -27,6 +29,26 @@ namespace Coldairarrow.Api
             services.AddEFCoreSharding(config => { 
                 
             });
+            
+
+            services.Configure<BrotliCompressionProviderOptions>(options =>
+            {
+                options.Level = CompressionLevel.Optimal;
+            }).Configure<GzipCompressionProviderOptions>(options =>
+            {
+                options.Level = CompressionLevel.Optimal;
+            }).AddResponseCompression(options =>
+            {
+                options.EnableForHttps = true;
+                options.Providers.Add<BrotliCompressionProvider>();
+                options.Providers.Add<GzipCompressionProvider>();
+                options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
+                {
+                    "application/json",
+                    "application/javascript",
+                    "text/json"
+                });
+            });
 
             services.Configure<ApiBehaviorOptions>(options => options.SuppressModelStateInvalidFilter = true);
             services.AddControllers(options =>
@@ -65,6 +87,7 @@ namespace Coldairarrow.Api
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            app.UseResponseCompression();
             //跨域
             app.UseCors(x =>
                 {

src/Coldairarrow.Business/HuiYan/catsBusiness.cs

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 
 namespace Coldairarrow.Business.HuiYan
@@ -250,9 +251,26 @@ namespace Coldairarrow.Business.HuiYan
 
         public async Task<List<CatTreeDTO>> GetTreeDataListAsync()
         {
-            var where = LinqHelper.True<cats>().And(c => c.Type == 0 || c.TeamId == _operator.TeamId);
+            var where = LinqHelper.True<TeamCatTimeDto>().And(c => c.Type == 0 || c.TeamId == _operator.TeamId);
+
+
+            Expression<Func<cats, teamcattime, TeamCatTimeDto>> select = (a, b) => new TeamCatTimeDto
+            {
+                LastTeamShowJDTime = b.LastShowJDTime,
+                LastTeamShowPddTime = b.LastShowPddTime,
+                LastTeamShowTBTime = b.LastShowTBTime
+            };
+
+            select = select.BuildExtendSelectExpre();
+            var q_Cat =  GetIQueryable();
+            var q = from a in q_Cat.AsExpandable()
+                    join b in Db.GetIQueryable<teamcattime>() on new { Id = a.Id, TeamId=_operator.TeamId } equals new { Id = b.CatId, b.TeamId } into ab
+                    from b in ab.DefaultIfEmpty()
+                    select @select.Invoke(a, b);
+
+
+            var list = await q.Where(where).ToListAsync();
 
-            var list = await GetIQueryable().Where(where).ToListAsync();
             var treeList = list
                 .Select(x => new CatTreeDTO
                 {
@@ -264,6 +282,9 @@ namespace Coldairarrow.Business.HuiYan
                     IsShowJDTime = x.LastShowJDTime == null ? true : (DateTime.Now - x.LastShowJDTime.Value).TotalDays > 45,
                     IsShowPddTime = x.LastShowPddTime == null ? true : (DateTime.Now - x.LastShowPddTime.Value).TotalDays > 45,
                     IsShowTBTime = x.LastShowTBTime == null ? true : (DateTime.Now - x.LastShowTBTime.Value).TotalDays > 45,
+                    IsTeamShowJDTime = x.LastTeamShowJDTime == null ? true : (DateTime.Now - x.LastTeamShowJDTime.Value).TotalDays > 45,
+                    IsTeamShowPddTime = x.LastTeamShowPddTime == null ? true : (DateTime.Now - x.LastTeamShowPddTime.Value).TotalDays > 45,
+                    IsTeamShowTBTime = x.LastTeamShowTBTime == null ? true : (DateTime.Now - x.LastTeamShowTBTime.Value).TotalDays > 45
                 }).ToList();
 
             return TreeHelper.BuildTree(treeList);
@@ -271,23 +292,72 @@ namespace Coldairarrow.Business.HuiYan
 
         public AjaxResult SetKeyOpenTime(string id, ItemPlatform platform)
         {
-            if (Db.Update<cats>(c => c.Id == id, (item) =>
+            var cat = Db.GetIQueryable<cats>().FirstOrDefault(c => c.Id == id);
+
+            if (cat.Type == 0)
             {
-                if(platform== ItemPlatform.Taobao) { 
-                item.LastShowTBTime = DateTime.Now;
-                }
-                if (platform == ItemPlatform.ALBB)
+                var time= Db.GetIQueryable<teamcattime>().FirstOrDefault(c => c.CatId == id && c.TeamId == _operator.TeamId);
+                if (time == null)
                 {
-                    item.LastShowPddTime = DateTime.Now;
+                    if (Db.Insert(new teamcattime()
+                    {
+                        Id = IdHelper.GetId(),
+                        CatId = id,
+                        CreateTime = DateTime.Now,
+                        CreatorId = _operator.UserId,
+                        Deleted = false,
+                        TeamId = _operator.TeamId,
+                        LastShowJDTime = platform == ItemPlatform.Jd?DateTime.Now: null,
+                        LastShowPddTime = platform == ItemPlatform.ALBB ? DateTime.Now : null,
+                        LastShowTBTime = platform == ItemPlatform.Taobao ? DateTime.Now : null
+                    }) > 0)
+                        return Success();
                 }
+                else {
 
-                if (platform == ItemPlatform.Jd)
-                {
-                    item.LastShowJDTime = DateTime.Now;
+                    if (Db.Update<teamcattime>(c => c.Id == time.Id, (item) => {
+
+                        if (platform == ItemPlatform.Taobao)
+                        {
+                            item.LastShowTBTime = DateTime.Now;
+                        }
+                        if (platform == ItemPlatform.ALBB)
+                        {
+                            item.LastShowPddTime = DateTime.Now;
+                        }
+
+                        if (platform == ItemPlatform.Jd)
+                        {
+                            item.LastShowJDTime = DateTime.Now;
+                        }
+
+
+                    }) > 0)
+                        return Success();
                 }
+            }
+            else
+            {
+                if (Db.Update<cats>(c => c.Id == id, (item) =>
+                {
 
-            }) > 0)
-                return Success();
+                    if (platform == ItemPlatform.Taobao)
+                    {
+                        item.LastShowTBTime = DateTime.Now;
+                    }
+                    if (platform == ItemPlatform.ALBB)
+                    {
+                        item.LastShowPddTime = DateTime.Now;
+                    }
+
+                    if (platform == ItemPlatform.Jd)
+                    {
+                        item.LastShowJDTime = DateTime.Now;
+                    }
+
+                }) > 0)
+                    return Success();
+            }
             return Error();
         }
 

src/Coldairarrow.Business/HuiYan/teamcattimeBusiness.cs

@@ -0,0 +1,65 @@
+using Coldairarrow.Entity.HuiYan;
+using Coldairarrow.Util;
+using EFCore.Sharding;
+using LinqKit;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+
+namespace Coldairarrow.Business.HuiYan
+{
+    public class teamcattimeBusiness : BaseBusiness<teamcattime>, IteamcattimeBusiness, ITransientDependency
+    {
+        public teamcattimeBusiness(IDbAccessor db)
+            : base(db)
+        {
+        }
+
+        #region 外部接口
+
+        public async Task<PageResult<teamcattime>> GetDataListAsync(PageInput<ConditionDTO> input)
+        {
+            var q = GetIQueryable();
+            var where = LinqHelper.True<teamcattime>();
+            var search = input.Search;
+
+            //筛选
+            if (!search.Condition.IsNullOrEmpty() && !search.Keyword.IsNullOrEmpty())
+            {
+                var newWhere = DynamicExpressionParser.ParseLambda<teamcattime, bool>(
+                    ParsingConfig.Default, false, $@"{search.Condition}.Contains(@0)", search.Keyword);
+                where = where.And(newWhere);
+            }
+
+            return await q.Where(where).GetPageResultAsync(input);
+        }
+
+        public async Task<teamcattime> GetTheDataAsync(string id)
+        {
+            return await GetEntityAsync(id);
+        }
+
+        public async Task AddDataAsync(teamcattime data)
+        {
+            await InsertAsync(data);
+        }
+
+        public async Task UpdateDataAsync(teamcattime data)
+        {
+            await UpdateAsync(data);
+        }
+
+        public async Task DeleteDataAsync(List<string> ids)
+        {
+            await DeleteAsync(ids);
+        }
+
+        #endregion
+
+        #region 私有成员
+
+        #endregion
+    }
+}

src/Coldairarrow.Entity/DTO/TeamCatTimeDto.cs

@@ -0,0 +1,27 @@
+using Coldairarrow.Entity.HuiYan;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Coldairarrow.Entity.DTO
+{
+    public class TeamCatTimeDto:cats
+    {
+        /// <summary>
+        /// 最后一次打开淘宝时间
+        /// </summary>
+        public DateTime? LastTeamShowTBTime { get; set; }
+
+        /// <summary>
+        /// 最后一次打开京东时间
+        /// </summary>
+        public DateTime? LastTeamShowJDTime { get; set; }
+
+        /// <summary>
+        /// 最后一次打开拼多多时间
+        /// </summary>
+        public DateTime? LastTeamShowPddTime { get; set; }
+    }
+}

src/Coldairarrow.Entity/HuiYan/teamcattime.cs

@@ -0,0 +1,61 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Coldairarrow.Entity.HuiYan
+{
+    /// <summary>
+    /// teamcattime
+    /// </summary>
+    [Table("teamcattime")]
+    public class teamcattime
+    {
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Key, Column(Order = 1)]
+        public String Id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人Id
+        /// </summary>
+        public String CreatorId { get; set; }
+
+        /// <summary>
+        /// 否已删除
+        /// </summary>
+        public Boolean Deleted { get; set; }
+
+        /// <summary>
+        /// 团队ID
+        /// </summary>
+        public String TeamId { get; set; }
+
+        /// <summary>
+        /// catId
+        /// </summary>
+        public String CatId { get; set; }
+
+        /// <summary>
+        /// 最后一次淘宝查看
+        /// </summary>
+        public DateTime? LastShowTBTime { get; set; }
+
+        /// <summary>
+        /// 最后一次京东查看
+        /// </summary>
+        public DateTime? LastShowJDTime { get; set; }
+
+        /// <summary>
+        /// 最后一次拼多多查看
+        /// </summary>
+        public DateTime? LastShowPddTime { get; set; }
+
+    }
+}

src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs

@@ -54,5 +54,12 @@ namespace Coldairarrow.Business.HuiYan
         /// 拼多多时间是否超时
         /// </summary>
         public bool IsShowPddTime { get; set; }
+
+
+        public bool IsTeamShowTBTime { get; set; }
+
+        public bool IsTeamShowJDTime { get; set; }
+
+        public bool IsTeamShowPddTime { get; set; }
     }
 }

src/Coldairarrow.IBusiness/HuiYan/IteamcattimeBusiness.cs

@@ -0,0 +1,16 @@
+using Coldairarrow.Entity.HuiYan;
+using Coldairarrow.Util;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Coldairarrow.Business.HuiYan
+{
+    public interface IteamcattimeBusiness
+    {
+        Task<PageResult<teamcattime>> GetDataListAsync(PageInput<ConditionDTO> input);
+        Task<teamcattime> GetTheDataAsync(string id);
+        Task AddDataAsync(teamcattime data);
+        Task UpdateDataAsync(teamcattime data);
+        Task DeleteDataAsync(List<string> ids);
+    }
+}

src/Coldairarrow.Web/.env

@@ -7,8 +7,8 @@ VUE_APP_DesktopPath=/Home/Introduce
 #发布后接口根地址
 VUE_APP_PublishRootUrl=http://hyapi.qiyue666.com
 #本地调试接口根地址
-#VUE_APP_LocalRootUrl=http://localhost:5000
-VUE_APP_LocalRootUrl=http://hyapi.qiyue666.com
+VUE_APP_LocalRootUrl=http://localhost:5000
+#VUE_APP_LocalRootUrl=http://hyapi.qiyue666.com
 #接口超时时间ms
 VUE_APP_ApiTimeout=10000
 #本地开发启动端口

src/Coldairarrow.Web/src/views/HuiYan/teamcattime/EditForm.vue

@@ -0,0 +1,92 @@
+<template>
+  <a-modal
+    :title="title"
+    width="40%"
+    :visible="visible"
+    :confirmLoading="loading"
+    @ok="handleSubmit"
+    @cancel="()=>{this.visible=false}"
+  >
+    <a-spin :spinning="loading">
+      <a-form-model ref="form" :model="entity" :rules="rules" v-bind="layout">
+        <a-form-model-item label="团队ID" prop="TeamId">
+          <a-input v-model="entity.TeamId" autocomplete="off" />
+        </a-form-model-item>
+        <a-form-model-item label="catId" prop="CatId">
+          <a-input v-model="entity.CatId" autocomplete="off" />
+        </a-form-model-item>
+        <a-form-model-item label="最后一次淘宝查看" prop="LastShowTBTime">
+          <a-input v-model="entity.LastShowTBTime" autocomplete="off" />
+        </a-form-model-item>
+        <a-form-model-item label="最后一次京东查看" prop="LastShowJDTime">
+          <a-input v-model="entity.LastShowJDTime" autocomplete="off" />
+        </a-form-model-item>
+        <a-form-model-item label="最后一次拼多多查看" prop="LastShowPddTime">
+          <a-input v-model="entity.LastShowPddTime" autocomplete="off" />
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    parentObj: Object
+  },
+  data() {
+    return {
+      layout: {
+        labelCol: { span: 5 },
+        wrapperCol: { span: 18 }
+      },
+      visible: false,
+      loading: false,
+      entity: {},
+      rules: {},
+      title: ''
+    }
+  },
+  methods: {
+    init() {
+      this.visible = true
+      this.entity = {}
+      this.$nextTick(() => {
+        this.$refs['form'].clearValidate()
+      })
+    },
+    openForm(id, title) {
+      this.init()
+
+      if (id) {
+        this.loading = true
+        this.$http.post('/HuiYan/teamcattime/GetTheData', { id: id }).then(resJson => {
+          this.loading = false
+
+          this.entity = resJson.Data
+        })
+      }
+    },
+    handleSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (!valid) {
+          return
+        }
+        this.loading = true
+        this.$http.post('/HuiYan/teamcattime/SaveData', this.entity).then(resJson => {
+          this.loading = false
+
+          if (resJson.Success) {
+            this.$message.success('操作成功!')
+            this.visible = false
+
+            this.parentObj.getDataList()
+          } else {
+            this.$message.error(resJson.Msg)
+          }
+        })
+      })
+    }
+  }
+}
+</script>

src/Coldairarrow.Web/src/views/HuiYan/teamcattime/List.vue

@@ -0,0 +1,162 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="hanldleAdd()">新建</a-button>
+      <a-button
+        type="primary"
+        icon="minus"
+        @click="handleDelete(selectedRowKeys)"
+        :disabled="!hasSelected()"
+        :loading="loading"
+      >删除</a-button>
+      <a-button type="primary" icon="redo" @click="getDataList()">刷新</a-button>
+    </div>
+
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="4" :sm="24">
+            <a-form-item label="查询类别">
+              <a-select allowClear v-model="queryParam.condition">
+                <a-select-option key="TeamId">团队ID</a-select-option>
+                <a-select-option key="CatId">catId</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item>
+              <a-input v-model="queryParam.keyword" placeholder="关键字" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="() => {this.pagination.current = 1; this.getDataList()}">查询</a-button>
+            <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <a-table
+      ref="table"
+      :columns="columns"
+      :rowKey="row => row.Id"
+      :dataSource="data"
+      :pagination="pagination"
+      :loading="loading"
+      @change="handleTableChange"
+      :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+      :bordered="true"
+      size="small"
+    >
+      <span slot="action" slot-scope="text, record">
+        <template>
+          <a @click="handleEdit(record.Id)">编辑</a>
+          <a-divider type="vertical" />
+          <a @click="handleDelete([record.Id])">删除</a>
+        </template>
+      </span>
+    </a-table>
+
+    <edit-form ref="editForm" :parentObj="this"></edit-form>
+  </a-card>
+</template>
+
+<script>
+import EditForm from './EditForm'
+
+const columns = [
+  { title: '团队ID', dataIndex: 'TeamId', width: '10%' },
+  { title: 'catId', dataIndex: 'CatId', width: '10%' },
+  { title: '最后一次淘宝查看', dataIndex: 'LastShowTBTime', width: '10%' },
+  { title: '最后一次京东查看', dataIndex: 'LastShowJDTime', width: '10%' },
+  { title: '最后一次拼多多查看', dataIndex: 'LastShowPddTime', width: '10%' },
+  { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' } }
+]
+
+export default {
+  components: {
+    EditForm
+  },
+  mounted() {
+    this.getDataList()
+  },
+  data() {
+    return {
+      data: [],
+      pagination: {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => `总数:${total} 当前:${range[0]}-${range[1]}`
+      },
+      filters: {},
+      sorter: { field: 'Id', order: 'asc' },
+      loading: false,
+      columns,
+      queryParam: {},
+      selectedRowKeys: []
+    }
+  },
+  methods: {
+    handleTableChange(pagination, filters, sorter) {
+      this.pagination = { ...pagination }
+      this.filters = { ...filters }
+      this.sorter = { ...sorter }
+      this.getDataList()
+    },
+    getDataList() {
+      this.selectedRowKeys = []
+
+      this.loading = true
+      this.$http
+        .post('/HuiYan/teamcattime/GetDataList', {
+          PageIndex: this.pagination.current,
+          PageRows: this.pagination.pageSize,
+          SortField: this.sorter.field || 'Id',
+          SortType: this.sorter.order,
+          Search: this.queryParam,
+          ...this.filters
+        })
+        .then(resJson => {
+          this.loading = false
+          this.data = resJson.Data
+          const pagination = { ...this.pagination }
+          pagination.total = resJson.Total
+          this.pagination = pagination
+        })
+    },
+    onSelectChange(selectedRowKeys) {
+      this.selectedRowKeys = selectedRowKeys
+    },
+    hasSelected() {
+      return this.selectedRowKeys.length > 0
+    },
+    hanldleAdd() {
+      this.$refs.editForm.openForm()
+    },
+    handleEdit(id) {
+      this.$refs.editForm.openForm(id)
+    },
+    handleDelete(ids) {
+      var thisObj = this
+      this.$confirm({
+        title: '确认删除吗?',
+        onOk() {
+          return new Promise((resolve, reject) => {
+            thisObj.$http.post('/HuiYan/teamcattime/DeleteData', ids).then(resJson => {
+              resolve()
+
+              if (resJson.Success) {
+                thisObj.$message.success('操作成功!')
+
+                thisObj.getDataList()
+              } else {
+                thisObj.$message.error(resJson.Msg)
+              }
+            })
+          })
+        }
+      })
+    }
+  }
+}
+</script>

客户端/齐越慧眼/齐越慧眼/ApiHelper.cs

@@ -24,7 +24,7 @@ namespace 齐越慧眼
         public static string JwtToken { 
             get
             {
-             //  return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA";
+               //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA";
               
                 if (string.IsNullOrEmpty(jwtToken))
                 {

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue

@@ -56,7 +56,7 @@
                         </a-col>
                         <a-col :span="19">
                           <div style="margin-top: -5px;">
-                            <a-tag style="cursor: pointer;float: left;margin-top: 5px;" :key="i4" @click="openKey(keyword,keyword.title,keyword.Id)"
+                            <a-tag :color="getTeamKeyColor(keyword)" style="cursor: pointer;float: left;margin-top: 5px;" :key="i4" @click="openKey(keyword,keyword.title,keyword.Id)"
                              v-for="(keyword,i4) in lastCat.children.filter(c=>c.Type==0)">
                               {{keyword.title}}</a-tag>
                           </div>
@@ -97,7 +97,7 @@
     data() {
       return {
         datas: [],
-        currentTab:0
+        currentTab:'0'
       }
     },
     mounted() {
@@ -110,16 +110,40 @@
     methods: {
       getKeyColor(keyword)
       {
-        console.log(keyword)
         switch(this.currentTab)
         {
+          case 0:
           case '0':
             return keyword.IsShowTBTime?'red':''
+          case 1:
           case '1':
             return keyword.IsShowJDTime?'red':''
+          case 2:
           case '2':
             return keyword.IsShowPddTime?'red':''
         }
+        console.log(this.currentTab,'this.currentTab')
+        return 'green'
+      },
+      getTeamKeyColor(keyword)
+      {
+        console.log(keyword.title,keyword)
+        switch(this.currentTab)
+        {
+          case 0:
+          case '0':
+            return keyword.IsTeamShowTBTime?'red':''
+            
+          case 1:
+          case '1':
+            return keyword.IsTeamShowJDTime?'red':''
+            
+          case 2:
+          case '2':
+            return keyword.IsTeamShowPddTime?'red':''
+        }
+        console.log(this.currentTab,'this.currentTab')
+        return 'green'
       },
       changeTab(e){
           this.currentTab=e

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue

@@ -424,7 +424,7 @@ export default {
       loading: false,
       queryParam: { condition: "State", keyword: 0 },
       selectedRowKeys: [],
-      currentTab: 0,
+      currentTab: '0',
       lastEditData: undefined,
       extFormList: ["以图搜款"],
     };

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue

@@ -385,7 +385,7 @@ export default {
       loading: false,
       queryParam: { condition: "State", keyword: 0 },
       selectedRowKeys: [],
-      currentTab: 0,
+      currentTab: '0',
       lastEditData: undefined,
       extFormList: ["以图搜款"],
     };