From a0ec62f29685af269361e32b8e24742bba24dff0 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 25 Dec 2024 21:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/messages.js            |  2 +-
 src/views/components/commonDialog.vue |  4 ++--
 src/views/dashboard.vue               | 18 +++++++++---------
 src/views/dashboard/topOne.vue        |  6 +++---
 src/views/system/messages/index.vue   | 19 ++++++++++---------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/api/system/messages.js b/src/api/system/messages.js
index 53bfd34..9e98088 100644
--- a/src/api/system/messages.js
+++ b/src/api/system/messages.js
@@ -1,4 +1,4 @@
-import request from '@/utils/request' 
+import request from '@/utils/request'
 
 // 查询用户列表
 export function listNotice(query) {
diff --git a/src/views/components/commonDialog.vue b/src/views/components/commonDialog.vue
index 10689ee..3de5c17 100644
--- a/src/views/components/commonDialog.vue
+++ b/src/views/components/commonDialog.vue
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import {listDept} from "@/api/system/dept";
+import {listDeptUser} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getDetailsList} from "@/api/report/attReport";
@@ -284,7 +284,7 @@ export default {
     },
     //部门选择
     getDeptList() {
-      listDept().then(response => {
+      listDeptUser().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
     },
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 838e032..03e4134 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -6,11 +6,11 @@
               <div style="width: 78%;margin: 0 1%;height: 100%;">
                   <TopOne @getHomeData="getHomeData" @openDialog="handleDialog"></TopOne>
               </div>
-              
+
               <div style="width: 20%;margin: 0 1%;height: 100%;">
                 <TopTwo :pageData="pageData.monthAbnormalBean" @openDialog="handleDialog"></TopTwo>
               </div>
-          </div> 
+          </div>
           <!-- 下侧数据模块列表 -->
           <div class="bottomModuleBox">
               <div style="width: 48%;margin: 0 1%;height: 100%;">
@@ -27,12 +27,12 @@
 </template>
 
 <script>
- 
+
 import TopOne from './dashboard/topOne.vue';
 import TopTwo from './dashboard/topTwo.vue';
 import BottomOne from './dashboard/bottomOne.vue';
 import BottomTwo from './dashboard/bottomTwo.vue';
-import CommonDialog from './components/commonDialog.vue' 
+import CommonDialog from './components/commonDialog.vue'
 import { getHomePageData } from '@/api/dashboard'
 export default {
   components: {
@@ -49,16 +49,16 @@ export default {
       }
   },
   created() {
- 
+
   },
 
-  mounted() { 
+  mounted() {
     // setTimeout(()=>{
     //   this.getHomePageData()
     // },2000)
   },
   computed: {
- 
+
   },
   methods: {
     getHomeData(data){
@@ -84,7 +84,7 @@ export default {
   background: #F8F8F8;
   color: #000;
   position: relative;
- 
+
   .container {
       width: 100%;
       height: auto;
@@ -102,7 +102,7 @@ export default {
           margin: 20px 0;
           display: flex;
       }
- 
+
   }
 }
 </style>
diff --git a/src/views/dashboard/topOne.vue b/src/views/dashboard/topOne.vue
index 237fe85..819c458 100644
--- a/src/views/dashboard/topOne.vue
+++ b/src/views/dashboard/topOne.vue
@@ -15,9 +15,9 @@
         <div id="pieBox" style="width: 100%;height: 260px;"></div>
         <!-- 点击区域 -->
         <div class="clickable-texts">
-          <div class="clickable-text expected" @click="handleClick('0')">应出勤人数</div>
-          <div class="clickable-text actual" @click="handleClick('1')">实际出勤人数</div>
-          <div class="clickable-text absent" @click="handleClick('2')">未出勤人数</div>
+          <div class="clickable-text expected" @click="handleClick('0')">应出勤人数应出勤人数</div>
+          <div class="clickable-text actual" @click="handleClick('1')">实际出勤人数实际出勤人数</div>
+          <div class="clickable-text absent" @click="handleClick('2')">未出勤人数未出勤人数</div>
         </div>
       </div>
 
diff --git a/src/views/system/messages/index.vue b/src/views/system/messages/index.vue
index 2d5ce5c..151f6b6 100644
--- a/src/views/system/messages/index.vue
+++ b/src/views/system/messages/index.vue
@@ -4,7 +4,7 @@
             <el-tab-pane label="全部消息" name="all"></el-tab-pane>
             <el-tab-pane label="未处理" name="unCare"></el-tab-pane>
         </el-tabs>
-  
+
         <el-table v-loading="loading" :data="tableList">
             <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
@@ -15,14 +15,14 @@
               <template slot-scope="scope">
                   <div v-if="scope.row.addressErrorNum!=0" @click="goJump(scope.row,scope.row.value)" style="color: #02a7f0; cursor: pointer">
                       {{ scope.row.title}}
-                  </div> 
+                  </div>
               </template>
             </el-table-column>
             <el-table-column label="消息内容" align="center" prop="content" :show-overflow-tooltip="true" >
               <template slot-scope="scope">
                   <div v-if="scope.row.addressErrorNum!=0" @click="goJump(scope.row,scope.row.value)" style="color: #02a7f0; cursor: pointer">
                       {{ scope.row.content}}
-                  </div> 
+                  </div>
               </template>
             </el-table-column>
             <el-table-column label="提交人" align="center" prop="userName" :show-overflow-tooltip="true" />
@@ -35,7 +35,7 @@
               </template>
             </el-table-column>
         </el-table>
-  
+
         <pagination
             v-show="total>0"
             :total="total"
@@ -45,7 +45,7 @@
         />
     </div>
   </template>
-  
+
   <script>
   import { listNotice,updateStatus } from "@/api/system/messages";
   export default {
@@ -103,7 +103,7 @@
             this.total = response.total;
             this.loading = false;
           }
-        ); 
+        );
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -130,15 +130,16 @@
           }else if(row.type.indexOf('轮休审批提醒')>-1){//userName
             this.$router.replace({ path: '/process/restExam',query:{param:value}})
           }else if(row.type.indexOf('临时外出审批提醒')>-1){//userName
+
             this.$router.replace({ path: '/process/outExam',query:{param:value}})
           }else if(row.type.indexOf('分公司项目部新增')>-1){//userName
             this.$router.replace({ path: '/process/org/branchProExamine',query:{param:value}})
           }else if(row.type.indexOf('考勤明细修改申请')>-1){//userName
             this.$router.replace({ path: '/process/record',query:{param:value}})
           }
-        }); 
+        });
       }
-      
+
     }
   };
-  </script>
\ No newline at end of file
+  </script>