diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 7fbb95a..d514424 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -89,9 +89,9 @@
       }, // 筛选条件
       columns: [
         { text: '时间', value: 'name', align: 'center' },
-        { text: '应出勤人数', value: 'total', align: 'center' },
-        { text: '实际出勤人数', value: 'real', align: 'center' },
-        { text: '出勤率', value: 'percent', align: 'center' }
+        // { text: '应出勤人数', value: 'total', align: 'center' },
+        { text: '实际出勤人数', value: 'count', align: 'center' },
+        // { text: '出勤率', value: 'percent', align: 'center' }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
@@ -159,55 +159,55 @@
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      // this.fetchData()
-      this.listLoading = true
-      this.list = [
-        { name: '1月', total: 15, real: 5, percent: '32.23%' },
-        { name: '2月', total: 15, real: 5, percent: '32.23%' },
-        { name: '3月', total: 15, real: 5, percent: '32.23%' },
-        { name: '4月', total: 15, real: 5, percent: '32.23%' },
-        { name: '5月', total: 15, real: 5, percent: '32.23%' },
-        { name: '6月', total: 15, real: 5, percent: '32.23%' },
-        { name: '7月', total: 15, real: 5, percent: '32.23%' },
-        { name: '8月', total: 15, real: 5, percent: '32.23%' },
-        { name: '9月', total: 15, real: 5, percent: '32.23%' },
-        { name: '10月', total: 15, real: 5, percent: '32.23%' },
-        { name: '11月', total: 15, real: 5, percent: '32.23%' },
-        { name: '12月', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      // this.fetchData()
+      this.fetchData()
       // this.listLoading = true
-      this.list = [
-        { name: '1.1', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      // this.list = [
+      //   { name: '1.1', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.15', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
       getAttendancePercent(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
+        this.list = response.data
+        this.total = response.data.length
         this.listLoading = false
       })
     },

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 7fbb95a..d514424 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -89,9 +89,9 @@
       }, // 筛选条件
       columns: [
         { text: '时间', value: 'name', align: 'center' },
-        { text: '应出勤人数', value: 'total', align: 'center' },
-        { text: '实际出勤人数', value: 'real', align: 'center' },
-        { text: '出勤率', value: 'percent', align: 'center' }
+        // { text: '应出勤人数', value: 'total', align: 'center' },
+        { text: '实际出勤人数', value: 'count', align: 'center' },
+        // { text: '出勤率', value: 'percent', align: 'center' }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
@@ -159,55 +159,55 @@
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      // this.fetchData()
-      this.listLoading = true
-      this.list = [
-        { name: '1月', total: 15, real: 5, percent: '32.23%' },
-        { name: '2月', total: 15, real: 5, percent: '32.23%' },
-        { name: '3月', total: 15, real: 5, percent: '32.23%' },
-        { name: '4月', total: 15, real: 5, percent: '32.23%' },
-        { name: '5月', total: 15, real: 5, percent: '32.23%' },
-        { name: '6月', total: 15, real: 5, percent: '32.23%' },
-        { name: '7月', total: 15, real: 5, percent: '32.23%' },
-        { name: '8月', total: 15, real: 5, percent: '32.23%' },
-        { name: '9月', total: 15, real: 5, percent: '32.23%' },
-        { name: '10月', total: 15, real: 5, percent: '32.23%' },
-        { name: '11月', total: 15, real: 5, percent: '32.23%' },
-        { name: '12月', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      // this.fetchData()
+      this.fetchData()
       // this.listLoading = true
-      this.list = [
-        { name: '1.1', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      // this.list = [
+      //   { name: '1.1', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.15', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
       getAttendancePercent(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
+        this.list = response.data
+        this.total = response.data.length
         this.listLoading = false
       })
     },
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index e3f8c53..6eceffb 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -127,8 +127,10 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       getAttendanceList(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 7fbb95a..d514424 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -89,9 +89,9 @@
       }, // 筛选条件
       columns: [
         { text: '时间', value: 'name', align: 'center' },
-        { text: '应出勤人数', value: 'total', align: 'center' },
-        { text: '实际出勤人数', value: 'real', align: 'center' },
-        { text: '出勤率', value: 'percent', align: 'center' }
+        // { text: '应出勤人数', value: 'total', align: 'center' },
+        { text: '实际出勤人数', value: 'count', align: 'center' },
+        // { text: '出勤率', value: 'percent', align: 'center' }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
@@ -159,55 +159,55 @@
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      // this.fetchData()
-      this.listLoading = true
-      this.list = [
-        { name: '1月', total: 15, real: 5, percent: '32.23%' },
-        { name: '2月', total: 15, real: 5, percent: '32.23%' },
-        { name: '3月', total: 15, real: 5, percent: '32.23%' },
-        { name: '4月', total: 15, real: 5, percent: '32.23%' },
-        { name: '5月', total: 15, real: 5, percent: '32.23%' },
-        { name: '6月', total: 15, real: 5, percent: '32.23%' },
-        { name: '7月', total: 15, real: 5, percent: '32.23%' },
-        { name: '8月', total: 15, real: 5, percent: '32.23%' },
-        { name: '9月', total: 15, real: 5, percent: '32.23%' },
-        { name: '10月', total: 15, real: 5, percent: '32.23%' },
-        { name: '11月', total: 15, real: 5, percent: '32.23%' },
-        { name: '12月', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      // this.fetchData()
+      this.fetchData()
       // this.listLoading = true
-      this.list = [
-        { name: '1.1', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      // this.list = [
+      //   { name: '1.1', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.15', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
       getAttendancePercent(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
+        this.list = response.data
+        this.total = response.data.length
         this.listLoading = false
       })
     },
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index e3f8c53..6eceffb 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -127,8 +127,10 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       getAttendanceList(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index fd5ae2f..2453ee5 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -70,7 +70,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="所属单位" prop="deptId">
-                <dept-select v-model="staffForm.deptId" :dept-show="true" placeholder="请选择所属单位" />
+                <dept-select v-model="staffForm.deptId" :dept-show="true" :disabled="isDetailMode" placeholder="请选择所属单位" />
               </el-form-item>
             </el-col>
           </el-row>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 7fbb95a..d514424 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -89,9 +89,9 @@
       }, // 筛选条件
       columns: [
         { text: '时间', value: 'name', align: 'center' },
-        { text: '应出勤人数', value: 'total', align: 'center' },
-        { text: '实际出勤人数', value: 'real', align: 'center' },
-        { text: '出勤率', value: 'percent', align: 'center' }
+        // { text: '应出勤人数', value: 'total', align: 'center' },
+        { text: '实际出勤人数', value: 'count', align: 'center' },
+        // { text: '出勤率', value: 'percent', align: 'center' }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
@@ -159,55 +159,55 @@
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      // this.fetchData()
-      this.listLoading = true
-      this.list = [
-        { name: '1月', total: 15, real: 5, percent: '32.23%' },
-        { name: '2月', total: 15, real: 5, percent: '32.23%' },
-        { name: '3月', total: 15, real: 5, percent: '32.23%' },
-        { name: '4月', total: 15, real: 5, percent: '32.23%' },
-        { name: '5月', total: 15, real: 5, percent: '32.23%' },
-        { name: '6月', total: 15, real: 5, percent: '32.23%' },
-        { name: '7月', total: 15, real: 5, percent: '32.23%' },
-        { name: '8月', total: 15, real: 5, percent: '32.23%' },
-        { name: '9月', total: 15, real: 5, percent: '32.23%' },
-        { name: '10月', total: 15, real: 5, percent: '32.23%' },
-        { name: '11月', total: 15, real: 5, percent: '32.23%' },
-        { name: '12月', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      // this.fetchData()
+      this.fetchData()
       // this.listLoading = true
-      this.list = [
-        { name: '1.1', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      // this.list = [
+      //   { name: '1.1', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.15', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
       getAttendancePercent(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
+        this.list = response.data
+        this.total = response.data.length
         this.listLoading = false
       })
     },
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index e3f8c53..6eceffb 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -127,8 +127,10 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       getAttendanceList(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index fd5ae2f..2453ee5 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -70,7 +70,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="所属单位" prop="deptId">
-                <dept-select v-model="staffForm.deptId" :dept-show="true" placeholder="请选择所属单位" />
+                <dept-select v-model="staffForm.deptId" :dept-show="true" :disabled="isDetailMode" placeholder="请选择所属单位" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 5540486..1e4af18 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
@@ -14,8 +14,8 @@
       <search-item>
         <el-date-picker
           v-model="dateRange"
-          type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           size="small"
           range-separator="至"
           start-placeholder="开始日期"
@@ -90,7 +90,6 @@
           align: 'center'
         }
       ], // 显示列
-      timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
@@ -125,6 +124,13 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       getToiletJobRecords(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -177,14 +183,15 @@
       this.listQuery = {
         name: '', // 作业人
         jobContent: '', // 作业内容
-        startTime: '', // 开始日期
         tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
         endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.dateRange = []
     }
   }
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a98b8a2..b1fd0e6 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination: {
+      type: Boolean,
+      default: true
+    }, // 是否分页
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 7fbb95a..d514424 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -89,9 +89,9 @@
       }, // 筛选条件
       columns: [
         { text: '时间', value: 'name', align: 'center' },
-        { text: '应出勤人数', value: 'total', align: 'center' },
-        { text: '实际出勤人数', value: 'real', align: 'center' },
-        { text: '出勤率', value: 'percent', align: 'center' }
+        // { text: '应出勤人数', value: 'total', align: 'center' },
+        { text: '实际出勤人数', value: 'count', align: 'center' },
+        // { text: '出勤率', value: 'percent', align: 'center' }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
@@ -159,55 +159,55 @@
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      // this.fetchData()
-      this.listLoading = true
-      this.list = [
-        { name: '1月', total: 15, real: 5, percent: '32.23%' },
-        { name: '2月', total: 15, real: 5, percent: '32.23%' },
-        { name: '3月', total: 15, real: 5, percent: '32.23%' },
-        { name: '4月', total: 15, real: 5, percent: '32.23%' },
-        { name: '5月', total: 15, real: 5, percent: '32.23%' },
-        { name: '6月', total: 15, real: 5, percent: '32.23%' },
-        { name: '7月', total: 15, real: 5, percent: '32.23%' },
-        { name: '8月', total: 15, real: 5, percent: '32.23%' },
-        { name: '9月', total: 15, real: 5, percent: '32.23%' },
-        { name: '10月', total: 15, real: 5, percent: '32.23%' },
-        { name: '11月', total: 15, real: 5, percent: '32.23%' },
-        { name: '12月', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      // this.fetchData()
+      this.fetchData()
       // this.listLoading = true
-      this.list = [
-        { name: '1.1', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      // this.list = [
+      //   { name: '1.1', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.15', total: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
       getAttendancePercent(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
+        this.list = response.data
+        this.total = response.data.length
         this.listLoading = false
       })
     },
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index e3f8c53..6eceffb 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -127,8 +127,10 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       getAttendanceList(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index fd5ae2f..2453ee5 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -70,7 +70,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="所属单位" prop="deptId">
-                <dept-select v-model="staffForm.deptId" :dept-show="true" placeholder="请选择所属单位" />
+                <dept-select v-model="staffForm.deptId" :dept-show="true" :disabled="isDetailMode" placeholder="请选择所属单位" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 5540486..1e4af18 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
@@ -14,8 +14,8 @@
       <search-item>
         <el-date-picker
           v-model="dateRange"
-          type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           size="small"
           range-separator="至"
           start-placeholder="开始日期"
@@ -90,7 +90,6 @@
           align: 'center'
         }
       ], // 显示列
-      timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
@@ -125,6 +124,13 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       getToiletJobRecords(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -177,14 +183,15 @@
       this.listQuery = {
         name: '', // 作业人
         jobContent: '', // 作业内容
-        startTime: '', // 开始日期
         tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
         endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.dateRange = []
     }
   }
 }
diff --git a/static/project.config.json b/static/project.config.json
index 2d3a87b..d578a84 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -3,7 +3,7 @@
   "sameWindow": false,
   "baseUrl": "http://111.198.10.15:11409/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
-  "singleSys": false,
+  "singleSys": true,
   "city":"崇仁县",
   "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",