diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 735e706..f4dff98 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="区域编码" prop="id">
-            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" @blur="validateId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -59,7 +59,7 @@
 
 <script>
 import { toTreeList } from '@/utils/structure'
-import { getAreaType, addArea, updateArea } from '@/api/system/area'
+import { getAreaType, addArea, updateArea, getAreaByid } from '@/api/system/area'
 import AreaSelectTree from './areaSelectTree'
 
 export default {
@@ -217,7 +217,20 @@
     cancel: function() {
       this.dialogFormVisible = false
       // this.$emit('watchChild')
-    }
+    },
+    validateId() {
+      if(this.dialogStatus !== 'create') {
+        return
+      }
+      if(this.areaForm.id) {
+        getAreaByid(this.areaForm.id).then(res => {
+          if(res.data) {
+            this.$message.warning('区域编码已经存在')
+            this.areaForm.id = ''
+          }
+        })
+      }
+    },
   }
 }
 </script>

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 735e706..f4dff98 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="区域编码" prop="id">
-            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" @blur="validateId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -59,7 +59,7 @@
 
 <script>
 import { toTreeList } from '@/utils/structure'
-import { getAreaType, addArea, updateArea } from '@/api/system/area'
+import { getAreaType, addArea, updateArea, getAreaByid } from '@/api/system/area'
 import AreaSelectTree from './areaSelectTree'
 
 export default {
@@ -217,7 +217,20 @@
     cancel: function() {
       this.dialogFormVisible = false
       // this.$emit('watchChild')
-    }
+    },
+    validateId() {
+      if(this.dialogStatus !== 'create') {
+        return
+      }
+      if(this.areaForm.id) {
+        getAreaByid(this.areaForm.id).then(res => {
+          if(res.data) {
+            this.$message.warning('区域编码已经存在')
+            this.areaForm.id = ''
+          }
+        })
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
index 25d9411..9b69b3f 100644
--- a/src/views/system/tenant/components/editTenant.vue
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -1,88 +1,56 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="100px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantCode" clearable placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantName" placeholder="请输入项目名称" clearable
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.linkPerson" placeholder="请输入项目联系人" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.tel" placeholder="请输入联系电话" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="历史保存天数" prop="clearday">
-            <el-input
+            <!-- <el-input
               v-model="deviceForm.clearday"
               placeholder="请输入历史数据保存天数"
               clearable
               :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            /> -->
+            <el-input-number v-model="deviceForm.clearday" :min="1" :precision="0" controls-position="right"
+              placeholder="请输入历史数据保存天数"
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
           <el-form-item label="组织名称" prop="deptName">
-            <dept-select
-              v-model="deviceForm.deptName"
-              :need-top="deptShowTop"
-              dept-type="03"
-              placeholder="选择权属单位"
-            />
+            <dept-select v-model="deviceForm.deptName" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 735e706..f4dff98 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="区域编码" prop="id">
-            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" @blur="validateId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -59,7 +59,7 @@
 
 <script>
 import { toTreeList } from '@/utils/structure'
-import { getAreaType, addArea, updateArea } from '@/api/system/area'
+import { getAreaType, addArea, updateArea, getAreaByid } from '@/api/system/area'
 import AreaSelectTree from './areaSelectTree'
 
 export default {
@@ -217,7 +217,20 @@
     cancel: function() {
       this.dialogFormVisible = false
       // this.$emit('watchChild')
-    }
+    },
+    validateId() {
+      if(this.dialogStatus !== 'create') {
+        return
+      }
+      if(this.areaForm.id) {
+        getAreaByid(this.areaForm.id).then(res => {
+          if(res.data) {
+            this.$message.warning('区域编码已经存在')
+            this.areaForm.id = ''
+          }
+        })
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
index 25d9411..9b69b3f 100644
--- a/src/views/system/tenant/components/editTenant.vue
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -1,88 +1,56 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="100px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantCode" clearable placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantName" placeholder="请输入项目名称" clearable
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.linkPerson" placeholder="请输入项目联系人" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.tel" placeholder="请输入联系电话" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="历史保存天数" prop="clearday">
-            <el-input
+            <!-- <el-input
               v-model="deviceForm.clearday"
               placeholder="请输入历史数据保存天数"
               clearable
               :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            /> -->
+            <el-input-number v-model="deviceForm.clearday" :min="1" :precision="0" controls-position="right"
+              placeholder="请输入历史数据保存天数"
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
           <el-form-item label="组织名称" prop="deptName">
-            <dept-select
-              v-model="deviceForm.deptName"
-              :need-top="deptShowTop"
-              dept-type="03"
-              placeholder="选择权属单位"
-            />
+            <dept-select v-model="deviceForm.deptName" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
index 1485510..1873445 100644
--- a/src/views/system/tenant/tenantList.vue
+++ b/src/views/system/tenant/tenantList.vue
@@ -1,28 +1,13 @@
 <template>
   <app-container>
-    <search-area
-      size="small"
-      @search="fetchData"
-    >
+    <search-area size="small" @search="fetchData">
       <!--一般查询条件-->
       <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          size="small"
-          placeholder="项目名称"
-          clearable
-        />
+        <el-input v-model="listQuery.tenantName" size="small" placeholder="项目名称" clearable />
       </search-item>
     </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
+    <normal-table ref="normalTable" :data="list" :total="total" :query="listQuery" :columns="columns"
+      :list-loading="listLoading" :options="options" size="small" @change="changePage">
       <template slot="btns">
         <el-button size="small" @click="add">
           新增
@@ -51,7 +36,7 @@
 
 <script>
 import EditTenant from '@/views/system/tenant/components/editTenant'
-import { getTenantList, delTenantSys } from '@/api/system/tenant'
+import { getTenantList, delTenantSys, getTenantListPage } from '@/api/system/tenant'
 import RelateDept from '@/views/system/tenant/components/relateDept'
 
 export default {
@@ -63,9 +48,11 @@
       listQuery: {
         tenantName: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       },
+      total: 0,
       columns: [
         {
           text: '项目编码',
@@ -117,11 +104,22 @@
     // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getTenantList(this.listQuery).then(response => {
-        this.list = response.data
+      getTenantListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
     },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
     del(row) {
       this.$confirm(
         '确定要删除所选项目吗？',

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 735e706..f4dff98 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="区域编码" prop="id">
-            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" @blur="validateId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -59,7 +59,7 @@
 
 <script>
 import { toTreeList } from '@/utils/structure'
-import { getAreaType, addArea, updateArea } from '@/api/system/area'
+import { getAreaType, addArea, updateArea, getAreaByid } from '@/api/system/area'
 import AreaSelectTree from './areaSelectTree'
 
 export default {
@@ -217,7 +217,20 @@
     cancel: function() {
       this.dialogFormVisible = false
       // this.$emit('watchChild')
-    }
+    },
+    validateId() {
+      if(this.dialogStatus !== 'create') {
+        return
+      }
+      if(this.areaForm.id) {
+        getAreaByid(this.areaForm.id).then(res => {
+          if(res.data) {
+            this.$message.warning('区域编码已经存在')
+            this.areaForm.id = ''
+          }
+        })
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
index 25d9411..9b69b3f 100644
--- a/src/views/system/tenant/components/editTenant.vue
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -1,88 +1,56 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="100px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantCode" clearable placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantName" placeholder="请输入项目名称" clearable
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.linkPerson" placeholder="请输入项目联系人" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.tel" placeholder="请输入联系电话" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="历史保存天数" prop="clearday">
-            <el-input
+            <!-- <el-input
               v-model="deviceForm.clearday"
               placeholder="请输入历史数据保存天数"
               clearable
               :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            /> -->
+            <el-input-number v-model="deviceForm.clearday" :min="1" :precision="0" controls-position="right"
+              placeholder="请输入历史数据保存天数"
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
           <el-form-item label="组织名称" prop="deptName">
-            <dept-select
-              v-model="deviceForm.deptName"
-              :need-top="deptShowTop"
-              dept-type="03"
-              placeholder="选择权属单位"
-            />
+            <dept-select v-model="deviceForm.deptName" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
index 1485510..1873445 100644
--- a/src/views/system/tenant/tenantList.vue
+++ b/src/views/system/tenant/tenantList.vue
@@ -1,28 +1,13 @@
 <template>
   <app-container>
-    <search-area
-      size="small"
-      @search="fetchData"
-    >
+    <search-area size="small" @search="fetchData">
       <!--一般查询条件-->
       <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          size="small"
-          placeholder="项目名称"
-          clearable
-        />
+        <el-input v-model="listQuery.tenantName" size="small" placeholder="项目名称" clearable />
       </search-item>
     </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
+    <normal-table ref="normalTable" :data="list" :total="total" :query="listQuery" :columns="columns"
+      :list-loading="listLoading" :options="options" size="small" @change="changePage">
       <template slot="btns">
         <el-button size="small" @click="add">
           新增
@@ -51,7 +36,7 @@
 
 <script>
 import EditTenant from '@/views/system/tenant/components/editTenant'
-import { getTenantList, delTenantSys } from '@/api/system/tenant'
+import { getTenantList, delTenantSys, getTenantListPage } from '@/api/system/tenant'
 import RelateDept from '@/views/system/tenant/components/relateDept'
 
 export default {
@@ -63,9 +48,11 @@
       listQuery: {
         tenantName: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       },
+      total: 0,
       columns: [
         {
           text: '项目编码',
@@ -117,11 +104,22 @@
     // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getTenantList(this.listQuery).then(response => {
-        this.list = response.data
+      getTenantListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
     },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
     del(row) {
       this.$confirm(
         '确定要删除所选项目吗？',
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 8d9778d..8c8e07a 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -4,42 +4,31 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构" :disabled="dialogStatus === 'detail' ? true : false" />
+            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="默认城市编码" prop="area">
-            <el-input
-              v-model="deviceForm.area"
-              clearable
-              placeholder="请输入城市编码"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.area" clearable placeholder="请输入城市编码"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="支持设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable :disabled="dialogStatus === 'detail' ? true : false">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable
+              :disabled="dialogStatus === 'detail' ? true : false">
+              <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="支持点位类型" prop="wellType">
-            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型" :disabled="dialogStatus === 'detail' ? true : false">
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型"
+              :disabled="dialogStatus === 'detail' ? true : false">
+              <el-option v-for="item in wellTypeList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -47,22 +36,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="地图默认中心-经度" prop="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.lng" clearable placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="地图默认中心-纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.lat" clearable placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +60,7 @@
 </template>
 
 <script>
-import { updateDeptPermission, addDeptPermission } from '@/api/systemConfig/deptPermission'
+import { updateDeptPermission, addDeptPermission, deptPermissionList } from '@/api/systemConfig/deptPermission'
 import { getDeviceType } from '@/api/device/device'
 import { getWellType } from '@/api/well/well'
 import DeptSelect from '@/components/DeptSelect'
@@ -192,26 +173,72 @@
       })
     },
     // 新增数据
-    createData: function() {
+    createData: function () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          addDeptPermission(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
+          deptPermissionList({ deptid: this.deviceForm.deptid }).then(res => {
+            if ((res.data || []).every((item) => item.deptid !== this.deviceForm.deptid)) {
+              addDeptPermission(this.deviceForm).then(response => {
+                if (response.code === 200) {
+                  this.$confirm('新增成功，是否继续新增?', '提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
+                    type: 'info'
+                  }).then(() => {
+                    this.resetForm()
+                    this.$nextTick(() => {
+                      this.$refs['dataForm'].clearValidate()
+                    })
+                  }).catch(() => {
+                    this.$emit('watchChild') // 刷新父组件数据列表
+                    this.dialogFormVisible = false
+                  })
+                }
+              })
+            }
+            else {
+              this.$confirm('该组织已经存在，是否继续添加?', '提示', {
                 confirmButtonText: '是',
                 cancelButtonText: '否',
                 type: 'info'
               }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
+                addDeptPermission(this.deviceForm).then(response => {
+                  if (response.code === 200) {
+                    this.$confirm('新增成功，是否继续新增?', '提示', {
+                      confirmButtonText: '是',
+                      cancelButtonText: '否',
+                      type: 'info'
+                    }).then(() => {
+                      this.resetForm()
+                      this.$nextTick(() => {
+                        this.$refs['dataForm'].clearValidate()
+                      })
+                    }).catch(() => {
+                      this.$emit('watchChild') // 刷新父组件数据列表
+                      this.dialogFormVisible = false
+                    })
+                  }
                 })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
               })
             }
           })
+          // addDeptPermission(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$confirm('新增成功，是否继续新增?', '提示', {
+          //       confirmButtonText: '是',
+          //       cancelButtonText: '否',
+          //       type: 'info'
+          //     }).then(() => {
+          //       this.resetForm()
+          //       this.$nextTick(() => {
+          //         this.$refs['dataForm'].clearValidate()
+          //       })
+          //     }).catch(() => {
+          //       this.$emit('watchChild') // 刷新父组件数据列表
+          //       this.dialogFormVisible = false
+          //     })
+          //   }
+          // })
         }
       })
     }
@@ -220,7 +247,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
 </style>

diff --git a/src/api/system/area.js b/src/api/system/area.js
index b24a1b7..6020505 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -31,7 +31,12 @@
     }
   })
 }
-
+export function getAreaByid(id) {
+  return request({
+    url: `/sys/area/detail/${id}`,
+    method: 'get',
+  })
+}
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 863476c..3aa5cf8 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -12,7 +12,13 @@
     params
   })
 }
-
+export function getTenantListPage(params) {
+  return request({
+    url: 'bus/tenant/pageList',
+    method: 'get',
+    params
+  })
+}
 // 添加项目管理
 export function addTenant(data) {
   return request({
diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index c4c47da..4ccf919 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -11,7 +11,13 @@
     params
   })
 }
-
+export function deptPermissionListPage(params) {
+  return request({
+    url: 'deptPermission/listPage',
+    method: 'get',
+    params
+  })
+}
 // 添加组织权限配置
 export function addDeptPermission(data) {
   return request({
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 735e706..f4dff98 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -16,7 +16,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="区域编码" prop="id">
-            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" @blur="validateId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -59,7 +59,7 @@
 
 <script>
 import { toTreeList } from '@/utils/structure'
-import { getAreaType, addArea, updateArea } from '@/api/system/area'
+import { getAreaType, addArea, updateArea, getAreaByid } from '@/api/system/area'
 import AreaSelectTree from './areaSelectTree'
 
 export default {
@@ -217,7 +217,20 @@
     cancel: function() {
       this.dialogFormVisible = false
       // this.$emit('watchChild')
-    }
+    },
+    validateId() {
+      if(this.dialogStatus !== 'create') {
+        return
+      }
+      if(this.areaForm.id) {
+        getAreaByid(this.areaForm.id).then(res => {
+          if(res.data) {
+            this.$message.warning('区域编码已经存在')
+            this.areaForm.id = ''
+          }
+        })
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
index 25d9411..9b69b3f 100644
--- a/src/views/system/tenant/components/editTenant.vue
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -1,88 +1,56 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="100px" label-well-code="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantCode" clearable placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
+            <el-input v-model="deviceForm.tenantName" placeholder="请输入项目名称" clearable
+              :disabled="dialogStatus === 'create' ? false : true" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.linkPerson" placeholder="请输入项目联系人" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            <el-input v-model="deviceForm.tel" placeholder="请输入联系电话" clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="历史保存天数" prop="clearday">
-            <el-input
+            <!-- <el-input
               v-model="deviceForm.clearday"
               placeholder="请输入历史数据保存天数"
               clearable
               :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
+            /> -->
+            <el-input-number v-model="deviceForm.clearday" :min="1" :precision="0" controls-position="right"
+              placeholder="请输入历史数据保存天数"
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
           <el-form-item label="组织名称" prop="deptName">
-            <dept-select
-              v-model="deviceForm.deptName"
-              :need-top="deptShowTop"
-              dept-type="03"
-              placeholder="选择权属单位"
-            />
+            <dept-select v-model="deviceForm.deptName" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
index 1485510..1873445 100644
--- a/src/views/system/tenant/tenantList.vue
+++ b/src/views/system/tenant/tenantList.vue
@@ -1,28 +1,13 @@
 <template>
   <app-container>
-    <search-area
-      size="small"
-      @search="fetchData"
-    >
+    <search-area size="small" @search="fetchData">
       <!--一般查询条件-->
       <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          size="small"
-          placeholder="项目名称"
-          clearable
-        />
+        <el-input v-model="listQuery.tenantName" size="small" placeholder="项目名称" clearable />
       </search-item>
     </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
+    <normal-table ref="normalTable" :data="list" :total="total" :query="listQuery" :columns="columns"
+      :list-loading="listLoading" :options="options" size="small" @change="changePage">
       <template slot="btns">
         <el-button size="small" @click="add">
           新增
@@ -51,7 +36,7 @@
 
 <script>
 import EditTenant from '@/views/system/tenant/components/editTenant'
-import { getTenantList, delTenantSys } from '@/api/system/tenant'
+import { getTenantList, delTenantSys, getTenantListPage } from '@/api/system/tenant'
 import RelateDept from '@/views/system/tenant/components/relateDept'
 
 export default {
@@ -63,9 +48,11 @@
       listQuery: {
         tenantName: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       },
+      total: 0,
       columns: [
         {
           text: '项目编码',
@@ -117,11 +104,22 @@
     // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getTenantList(this.listQuery).then(response => {
-        this.list = response.data
+      getTenantListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
     },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
     del(row) {
       this.$confirm(
         '确定要删除所选项目吗？',
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 8d9778d..8c8e07a 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -4,42 +4,31 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构" :disabled="dialogStatus === 'detail' ? true : false" />
+            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="默认城市编码" prop="area">
-            <el-input
-              v-model="deviceForm.area"
-              clearable
-              placeholder="请输入城市编码"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.area" clearable placeholder="请输入城市编码"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="支持设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable :disabled="dialogStatus === 'detail' ? true : false">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable
+              :disabled="dialogStatus === 'detail' ? true : false">
+              <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="支持点位类型" prop="wellType">
-            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型" :disabled="dialogStatus === 'detail' ? true : false">
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型"
+              :disabled="dialogStatus === 'detail' ? true : false">
+              <el-option v-for="item in wellTypeList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -47,22 +36,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="地图默认中心-经度" prop="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.lng" clearable placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="地图默认中心-纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
+            <el-input v-model="deviceForm.lat" clearable placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +60,7 @@
 </template>
 
 <script>
-import { updateDeptPermission, addDeptPermission } from '@/api/systemConfig/deptPermission'
+import { updateDeptPermission, addDeptPermission, deptPermissionList } from '@/api/systemConfig/deptPermission'
 import { getDeviceType } from '@/api/device/device'
 import { getWellType } from '@/api/well/well'
 import DeptSelect from '@/components/DeptSelect'
@@ -192,26 +173,72 @@
       })
     },
     // 新增数据
-    createData: function() {
+    createData: function () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          addDeptPermission(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
+          deptPermissionList({ deptid: this.deviceForm.deptid }).then(res => {
+            if ((res.data || []).every((item) => item.deptid !== this.deviceForm.deptid)) {
+              addDeptPermission(this.deviceForm).then(response => {
+                if (response.code === 200) {
+                  this.$confirm('新增成功，是否继续新增?', '提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
+                    type: 'info'
+                  }).then(() => {
+                    this.resetForm()
+                    this.$nextTick(() => {
+                      this.$refs['dataForm'].clearValidate()
+                    })
+                  }).catch(() => {
+                    this.$emit('watchChild') // 刷新父组件数据列表
+                    this.dialogFormVisible = false
+                  })
+                }
+              })
+            }
+            else {
+              this.$confirm('该组织已经存在，是否继续添加?', '提示', {
                 confirmButtonText: '是',
                 cancelButtonText: '否',
                 type: 'info'
               }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
+                addDeptPermission(this.deviceForm).then(response => {
+                  if (response.code === 200) {
+                    this.$confirm('新增成功，是否继续新增?', '提示', {
+                      confirmButtonText: '是',
+                      cancelButtonText: '否',
+                      type: 'info'
+                    }).then(() => {
+                      this.resetForm()
+                      this.$nextTick(() => {
+                        this.$refs['dataForm'].clearValidate()
+                      })
+                    }).catch(() => {
+                      this.$emit('watchChild') // 刷新父组件数据列表
+                      this.dialogFormVisible = false
+                    })
+                  }
                 })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
               })
             }
           })
+          // addDeptPermission(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$confirm('新增成功，是否继续新增?', '提示', {
+          //       confirmButtonText: '是',
+          //       cancelButtonText: '否',
+          //       type: 'info'
+          //     }).then(() => {
+          //       this.resetForm()
+          //       this.$nextTick(() => {
+          //         this.$refs['dataForm'].clearValidate()
+          //       })
+          //     }).catch(() => {
+          //       this.$emit('watchChild') // 刷新父组件数据列表
+          //       this.dialogFormVisible = false
+          //     })
+          //   }
+          // })
         }
       })
     }
@@ -220,7 +247,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
 </style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 4518e08..9065dc8 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -12,7 +12,7 @@
         <dept-select v-model="listQuery.deptid" :need-top="true" placeholder="选择组织机构" />
       </search-item>
     </search-area>
-    <normal-table ref="normalTable" :data="list" :query="listQuery" :columns="columns" :list-loading="listLoading" :options="options" size="small">
+    <normal-table ref="normalTable" :data="list" :total="total" :query="listQuery" :columns="columns" :list-loading="listLoading" :options="options" size="small" @change="changePage">
       <template slot="btns">
         <el-button v-if="hasPerm('/deptPermission/add')" size="small" @click="add">
           新增
@@ -41,7 +41,7 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 import EditDeptPermission from '@/views/systemConfig/deptPermission/components/editDeptPermission'
-import { deptPermissionList, delDeptPermission } from '@/api/systemConfig/deptPermission'
+import { deptPermissionList, delDeptPermission, deptPermissionListPage  } from '@/api/systemConfig/deptPermission'
 
 export default {
   name: 'DeptPermission',
@@ -50,7 +50,9 @@
     return {
       // 查询条件
       listQuery: {
-        deptid: ''
+        deptid: '',
+        limit: 20,
+        offset: 1,
       },
       columns: [
         {
@@ -102,11 +104,22 @@
     // 获取数据列表
     fetchData() {
       this.listLoading = true
-      deptPermissionList(this.listQuery).then(response => {
-        this.list = response.data
+      deptPermissionListPage(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
         this.listLoading = false
       })
     },
+        // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+        changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
     del(row) {
       this.$confirm(
         '确定要删除所选配置项吗？',
@@ -146,5 +159,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-</style>