From 8122ebd7f5073e5bdf31fed8b6f99a639c02efcc Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Thu, 4 Aug 2022 00:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/home/controller/Index.php    | 5 +++++
 app/project/view/task/index.html | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php
index 6dd5694..aa04d39 100644
--- a/app/home/controller/Index.php
+++ b/app/home/controller/Index.php
@@ -105,11 +105,16 @@ class Index extends BaseController
         $total = [];
         $adminCount = Db::name('Admin')->where('status', '1')->count();
         $approveCount = Db::name('Approve')->count();
+        $noteCount = Db::name('Note')->where('status', '1')->count();
         $expenseCount = Db::name('Expense')->where('delete_time', '0')->count();
         $invoiceCount = Db::name('Invoice')->where('delete_time', '0')->count();
         $total[] = array(
             'name' => '员工',
             'num' => $adminCount,
+        );
+		$total[] = array(
+            'name' => '公告',
+            'num' => $noteCount,
         );
         $total[] = array(
             'name' => '审批',
diff --git a/app/project/view/task/index.html b/app/project/view/task/index.html
index 92b18b5..4801a9e 100644
--- a/app/project/view/task/index.html
+++ b/app/project/view/task/index.html
@@ -97,11 +97,7 @@
 					}
 				}
 				, { field: 'cate_name', title: '工作类型', width: 90, align: 'center' }
-				, { field: 'type_name', title: '任务类型', width: 90, align: 'center',templet:function(d){
-						var html = '<span class="layui-color-'+d.type+'">'+d.type_name+'</span>';
-						return html;
-					}}
-				, {
+				,{
 					field: 'title', title: '任务主题', rowspan: 2, templet: function (d) {
 						var html = '<span class="layui-badge layui-bg-' + d.priority + '">' + d.priority_name + '</span> <a class="side-a" data-href="/project/task/view/id/' + d.id + '">' + d.title + '</a>';
 						return html;