From b4350e894965661fbd131258158b1a9772ec9e4b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 18 Mar 2021 09:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9D=83=E9=99=90=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js               |  4 ++--
 client/src/views/dashboard/index.vue     | 15 +++++++++++----
 client/src/views/supervision/content.vue |  4 ++--
 server/apps/supervision/views.py         | 11 +++++++++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index 6fd2674..2482531 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -130,14 +130,14 @@ export const asyncRoutes = [
       path: 'record',
       name: 'Record',
       component: () => import('@/views/supervision/record.vue'),
-      meta: { title: '材料列表', icon: 'guide', perms: ['record_manage'] }
+      meta: { title: '材料列表', icon: 'guide', perms: ['record_all'] }
     }
     ,
     {
       path: 'report',
       name: 'Report',
       component: () => import('@/views/supervision/report.vue'),
-      meta: { title: '材料报送', icon: 'guide', perms: ['report_manage'] }
+      meta: { title: '材料报送', icon: 'guide', perms: ['record_view'] }
     }
       ,
     {
diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index 54a1ba8..b5436e3 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-      <el-row :gutter="40" class="panel-group">
+      <el-row :gutter="10" class="panel-group">
         <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
       <div class="card-panel" @click="toPath('/qualification')">
         <div class="card-panel-icon-wrapper icon-money">
@@ -53,6 +53,13 @@
         </div>
       </div>
     </el-col>
+    <el-col :xs="24" :sm="24" :lg="12" :xl="6">
+      <el-card>
+        <div slot="header" class="clearfix">
+        <span>待办任务提醒</span>
+      </div>
+      </el-card>
+    </el-col>
   </el-row>
   </div>
 </template>
@@ -79,7 +86,7 @@ export default {
 <style lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 10px;
   }
   &-text {
     font-size: 30px;
@@ -87,10 +94,10 @@ export default {
   }
 }
 .panel-group {
-  margin-top: 18px;
+  margin-top: 10px;
 
   .card-panel-col {
-    margin-bottom: 32px;
+    margin-bottom: 10px;
   }
 
   .card-panel {
diff --git a/client/src/views/supervision/content.vue b/client/src/views/supervision/content.vue
index 00c4d0f..3e8386f 100644
--- a/client/src/views/supervision/content.vue
+++ b/client/src/views/supervision/content.vue
@@ -37,14 +37,14 @@
       <el-table-column align="center" label="操作" width="200px" fixed="right">
         <template slot-scope="scope">
           <el-button
-            :disabled="!checkPermission(['content_update'])"
+            :disabled="!checkPermission(['content'])"
             type="primary"
             size="small"
             icon="el-icon-edit"
             @click="handleEdit(scope)"
           />
           <el-button
-            :disabled="!checkPermission(['content_delete'])"
+            :disabled="!checkPermission(['content'])"
             type="danger"
             size="small"
             icon="el-icon-delete"
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 9715af2..9f47b4b 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -23,8 +23,8 @@ class ContentViewSet(CreateUpdateCustomMixin, ModelViewSet):
     """
     资料清单：增删改查
     """
-    perms_map = {'get': '*', 'post': 'content_create',
-                 'put': 'content_update', 'delete': 'content_delete'}
+    perms_map = {'get': '*', 'post': 'content',
+                 'put': 'content', 'delete': 'content'}
     queryset = Content.objects.all()
     serializer_class = ContentSerializer
     pagination_class = None
@@ -119,6 +119,13 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
     ordering = ['create_time']
     filter_class = RecordFilter # 过滤类
 
+    @action(methods=['get'], detail=False, perms_map = {'get':'*'})
+    def todos(self, request, *args, **kwargs):
+        dept = request.user.belong_dept
+        toup = Record.objects.filter(is_deleted=False, belong_dept=dept, state='待上报').count()
+        tozg = Record.objects.filter(is_delete=False,belong_dept=dept,state='待整改').count()
+        return Response({'toup':toup, 'tozg':tozg})
+
     def update(self, request, *args, **kwargs):
         instance = self.get_object()
         instance.note = request.data.get('note', None)