diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',
diff --git a/src/assets/global_images/offline.png b/src/assets/global_images/offline.png
new file mode 100644
index 0000000..7948d43
--- /dev/null
+++ b/src/assets/global_images/offline.png
Binary files differ

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',
diff --git a/src/assets/global_images/offline.png b/src/assets/global_images/offline.png
new file mode 100644
index 0000000..7948d43
--- /dev/null
+++ b/src/assets/global_images/offline.png
Binary files differ
diff --git a/src/assets/global_images/online.png b/src/assets/global_images/online.png
new file mode 100644
index 0000000..298bd1b
--- /dev/null
+++ b/src/assets/global_images/online.png
Binary files differ

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',
diff --git a/src/assets/global_images/offline.png b/src/assets/global_images/offline.png
new file mode 100644
index 0000000..7948d43
--- /dev/null
+++ b/src/assets/global_images/offline.png
Binary files differ
diff --git a/src/assets/global_images/online.png b/src/assets/global_images/online.png
new file mode 100644
index 0000000..298bd1b
--- /dev/null
+++ b/src/assets/global_images/online.png
Binary files differ
diff --git a/src/views/device/deviceList.vue b/src/views/device/deviceList.vue
index b5343de..daaf5c7 100644
--- a/src/views/device/deviceList.vue
+++ b/src/views/device/deviceList.vue
@@ -29,7 +29,7 @@
             :value="item.value"/>
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.position" size="small" style="width: 200px" placeholder="所在区域" clearable @change="fetchData(false)">
           <el-option
             v-for="item in positionList"
@@ -56,7 +56,7 @@
             :label="item.name"
             :value="item.value"/>
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <normal-table
       :data="list"
@@ -175,21 +175,31 @@
           align: 'center',
           width: 90
         },
+        // {
+        //   text: '所在区域',
+        //   value: 'positionName',
+        //   align: 'center'
+        // },
         {
-          text: '所在区域',
-          value: 'positionName',
+          text: '经度',
+          value: 'longitude',
           align: 'center'
         },
         {
-          text: '楼层',
-          value: 'areaName',
+          text: '纬度',
+          value: 'latitude',
           align: 'center'
         },
-        {
-          text: '是否为重点区域',
-          value: 'isKeyAreaName',
-          align: 'center'
-        },
+        // {
+        //   text: '楼层',
+        //   value: 'areaName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '是否为重点区域',
+        //   value: 'isKeyAreaName',
+        //   align: 'center'
+        // },
         {
           text: '安装时间',
           value: 'installTime',

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',
diff --git a/src/assets/global_images/offline.png b/src/assets/global_images/offline.png
new file mode 100644
index 0000000..7948d43
--- /dev/null
+++ b/src/assets/global_images/offline.png
Binary files differ
diff --git a/src/assets/global_images/online.png b/src/assets/global_images/online.png
new file mode 100644
index 0000000..298bd1b
--- /dev/null
+++ b/src/assets/global_images/online.png
Binary files differ
diff --git a/src/views/device/deviceList.vue b/src/views/device/deviceList.vue
index b5343de..daaf5c7 100644
--- a/src/views/device/deviceList.vue
+++ b/src/views/device/deviceList.vue
@@ -29,7 +29,7 @@
             :value="item.value"/>
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.position" size="small" style="width: 200px" placeholder="所在区域" clearable @change="fetchData(false)">
           <el-option
             v-for="item in positionList"
@@ -56,7 +56,7 @@
             :label="item.name"
             :value="item.value"/>
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <normal-table
       :data="list"
@@ -175,21 +175,31 @@
           align: 'center',
           width: 90
         },
+        // {
+        //   text: '所在区域',
+        //   value: 'positionName',
+        //   align: 'center'
+        // },
         {
-          text: '所在区域',
-          value: 'positionName',
+          text: '经度',
+          value: 'longitude',
           align: 'center'
         },
         {
-          text: '楼层',
-          value: 'areaName',
+          text: '纬度',
+          value: 'latitude',
           align: 'center'
         },
-        {
-          text: '是否为重点区域',
-          value: 'isKeyAreaName',
-          align: 'center'
-        },
+        // {
+        //   text: '楼层',
+        //   value: 'areaName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '是否为重点区域',
+        //   value: 'isKeyAreaName',
+        //   align: 'center'
+        // },
         {
           text: '安装时间',
           value: 'installTime',
diff --git a/src/views/device/editDevice.vue b/src/views/device/editDevice.vue
index 726c262..b464979 100644
--- a/src/views/device/editDevice.vue
+++ b/src/views/device/editDevice.vue
@@ -41,7 +41,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="是否为重点区域" prop="isKeyArea">
             <el-select v-model="form.isKeyArea" placeholder="必填" :disabled="isEditMode">
               <el-option
@@ -76,6 +76,16 @@
               />
             </el-select>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="12">
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="form.longitude" :disabled="isEditMode" type="text" placeholder="经度" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="form.latitude" :disabled="isEditMode" type="text" placeholder="纬度" />
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="安装时间" prop="installTime">
@@ -149,7 +159,9 @@
         position: '',
         isKeyArea: '',
         detailLocation: '',
-        remarks: ''
+        remarks: '',
+        longitude: '',
+        latitude: '',
       }, // 表单
       typeList: [],
       statusList: [],
@@ -172,7 +184,9 @@
         detailLocation: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '所在楼栋不能为空', trigger: ['blur', 'change'] }],
         area: [{ required: true, message: '楼层不能为空', trigger: ['blur', 'change'] }],
-        ip: [{ required: true, validator: validateip, trigger: ['blur', 'change'] }]
+        ip: [{ required: true, validator: validateip, trigger: ['blur', 'change'] }],
+        longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
       } // 前端校验规则
     }
   },

diff --git a/public/config/project.config.json b/public/config/project.config.json
index fb545f3..206a4f9 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,8 @@
   "title": "视频监控系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:21610/",
+  "uri":"http://111.198.10.15:21610/",
+  "baseUrl": "http://111.198.10.15:21608/",
   "wsUrl": "ws://192.168.10.6:5903/websocket/",
   "icsUrl": "ws://127.0.0.1:1234",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
diff --git a/src/api/device.js b/src/api/device.js
index 0ba70ff..e9a596a 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -3,6 +3,7 @@
  */
 import request from '@/utils/request'
 
+// 设备分页
 export function getDeviceListPage(params) {
   return request({
     url: 'deviceInfo/listPage',
@@ -11,6 +12,7 @@
   })
 }
 
+// 设备不分页
 export function getDeviceList(data) {
   return request({
     url: 'deviceInfo/list',
@@ -19,6 +21,15 @@
   })
 }
 
+// 设备在线离线数量
+export function offlineCount(params) {
+  return request({
+    url: 'deviceInfo/offlineCount',
+    method: 'get',
+    params
+  })
+}
+
 export function addDevice(data) {
   return request({
     url: 'deviceInfo/add',
diff --git a/src/assets/global_images/offline.png b/src/assets/global_images/offline.png
new file mode 100644
index 0000000..7948d43
--- /dev/null
+++ b/src/assets/global_images/offline.png
Binary files differ
diff --git a/src/assets/global_images/online.png b/src/assets/global_images/online.png
new file mode 100644
index 0000000..298bd1b
--- /dev/null
+++ b/src/assets/global_images/online.png
Binary files differ
diff --git a/src/views/device/deviceList.vue b/src/views/device/deviceList.vue
index b5343de..daaf5c7 100644
--- a/src/views/device/deviceList.vue
+++ b/src/views/device/deviceList.vue
@@ -29,7 +29,7 @@
             :value="item.value"/>
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.position" size="small" style="width: 200px" placeholder="所在区域" clearable @change="fetchData(false)">
           <el-option
             v-for="item in positionList"
@@ -56,7 +56,7 @@
             :label="item.name"
             :value="item.value"/>
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <normal-table
       :data="list"
@@ -175,21 +175,31 @@
           align: 'center',
           width: 90
         },
+        // {
+        //   text: '所在区域',
+        //   value: 'positionName',
+        //   align: 'center'
+        // },
         {
-          text: '所在区域',
-          value: 'positionName',
+          text: '经度',
+          value: 'longitude',
           align: 'center'
         },
         {
-          text: '楼层',
-          value: 'areaName',
+          text: '纬度',
+          value: 'latitude',
           align: 'center'
         },
-        {
-          text: '是否为重点区域',
-          value: 'isKeyAreaName',
-          align: 'center'
-        },
+        // {
+        //   text: '楼层',
+        //   value: 'areaName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '是否为重点区域',
+        //   value: 'isKeyAreaName',
+        //   align: 'center'
+        // },
         {
           text: '安装时间',
           value: 'installTime',
diff --git a/src/views/device/editDevice.vue b/src/views/device/editDevice.vue
index 726c262..b464979 100644
--- a/src/views/device/editDevice.vue
+++ b/src/views/device/editDevice.vue
@@ -41,7 +41,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="是否为重点区域" prop="isKeyArea">
             <el-select v-model="form.isKeyArea" placeholder="必填" :disabled="isEditMode">
               <el-option
@@ -76,6 +76,16 @@
               />
             </el-select>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="12">
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="form.longitude" :disabled="isEditMode" type="text" placeholder="经度" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="form.latitude" :disabled="isEditMode" type="text" placeholder="纬度" />
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="安装时间" prop="installTime">
@@ -149,7 +159,9 @@
         position: '',
         isKeyArea: '',
         detailLocation: '',
-        remarks: ''
+        remarks: '',
+        longitude: '',
+        latitude: '',
       }, // 表单
       typeList: [],
       statusList: [],
@@ -172,7 +184,9 @@
         detailLocation: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '所在楼栋不能为空', trigger: ['blur', 'change'] }],
         area: [{ required: true, message: '楼层不能为空', trigger: ['blur', 'change'] }],
-        ip: [{ required: true, validator: validateip, trigger: ['blur', 'change'] }]
+        ip: [{ required: true, validator: validateip, trigger: ['blur', 'change'] }],
+        longitude: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
       } // 前端校验规则
     }
   },
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index ac3a88b..764e2c1 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -3,14 +3,14 @@
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="设备描述" clearable/>
+        <el-form-item class="selectForm-container-item" prop="remarks">
+          <el-input v-model.trim="listQuery.remarks" placeholder="设备描述" clearable/>
         </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="设备ip" clearable/>
+        <el-form-item class="selectForm-container-item" prop="ip">
+          <el-input v-model="listQuery.ip" placeholder="ip" clearable/>
         </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="设备类型" clearable value="" @change="fetchData()">
+        <el-form-item class="selectForm-container-item" prop="devType">
+          <el-select v-model="listQuery.devType" filterable placeholder="设备类型" clearable value="" @change="fetchData()">
             <el-option
               v-for="item in cartypelist"
               :key="item.value"
@@ -18,14 +18,14 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
+        <!-- <el-form-item class="selectForm-container-item" prop="keywords">
           <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
       </el-form>
     </div>
-    <div id="map" style="height: calc(100vh - 140px)">
+    <div id="map" style="height: calc(100vh - 120px)">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
@@ -53,6 +53,19 @@
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
         </el-row>
+        <el-row>
+          <el-pagination
+            v-show="total && showtable"
+            :current-page="listQuery.offset"
+            :page-sizes="[15,20,30]"
+            :page-size="listQuery.limit"
+            :total="total"
+            class="pagination-container"
+            align="center"
+            layout="total, prev, pager, next"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
         <div class="table-name" style="color: white">
@@ -61,45 +74,28 @@
         <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
         <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+      <el-table v-if="showtable==true" :row-style="{height: '25px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" >
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column label="更多" width="110" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>-->
-<!--            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
-      <div class="pagination-container">
-        <el-pagination
-          v-show="total>listQuery.limit"
-          :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
-          :page-size="listQuery.limit"
-          :total="total"
-          class="table-bottom"
-          align="center"
-          layout="total, sizes, prev, pager, next"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
     </div>
 <!--    <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>-->
   </div>
 </template>
 <script>
 // import editCarInfo from '@/views/carinfo/editCarInfo'
-import { getOverviewList, offlineCount, getOverviewAllList } from '@/api/overview'
-import { getDictCode } from '@/api/system/dict'
+import { getOverviewList, getOverviewAllList } from '@/api/overview'
+import { offlineCount } from '@/api/device'
+import { getDictByCode } from '@/api/system/dict'
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+import { getDeviceListPage, getDeviceList} from '@/api/device'
 export default {
   name: 'ListOverview',
   components: { DeptSelect },
@@ -112,27 +108,27 @@
       showtable: true,
       deptShow: true,
       listQuery: {
-        description: '',
-        carCode: '',
-        carType: '',
-        deptId: '',
+        remarks: '',
+        ip: '',
+        devType: '',
+        // deptId: '',
         offset: 1,
         limit: 15
       }, // 查询条件
       columns: [
         {
           text: '设备名称',
-          value: 'description',
+          value: 'devName' || 'description',
           align: 'center'
         },
         {
           text: '设备ip',
-          value: 'carCode',
+          value: 'ip' || 'carCode',
           align: 'center'
         },
         {
           text: '状态',
-          value: 'status',
+          value: 'statusName' || 'status',
           align: 'center',
           width: 70
         }
@@ -168,14 +164,14 @@
     sec(val) {
       if (val === 0) {
         this.sec = Number(this.refresh)
-        this.fetchCar()
+        this.fetchData()
       }
     }
   },
   mounted() {
-    // getDictCode('carType').then(response => {
-    //   this.cartypelist = response.data
-    // })
+    getDictByCode('deviceType').then(response => {
+      this.cartypelist = response.data
+    })
     this.initMap()
     this.fetchData()
     setInterval(() => {
@@ -184,7 +180,7 @@
   },
   methods: {
     dbSelected(row) {
-      this.map.setView({ lat: Number(row.lat), lng: Number(row.lng) }, 18)
+      this.map.setView({ lat: Number(row.latitude), lng: Number(row.longitude) }, 18)
     },
     tableclick() {
       this.showtable = !this.showtable
@@ -296,205 +292,92 @@
       }
     },
     fetchData(isNowPage = true) {
-      // this.listLoading = true
-      offlineCount(this.listQuery).then(response => {
-        this.online = response.data.online
-        this.offline = response.data.offline
-      })
-      this.sec = Number(this.refresh)
-      if (!isNowPage) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getOverviewList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        // this.listLoading = false
+
+      // offlineCount(this.listQuery).then(response => {
+      //   this.online = response.data.online
+      //   this.offline = response.data.offline
+      // })
+
+      getDeviceListPage(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
       })
-      getOverviewAllList(this.listQuery).then(response => {
-        this.alllist = response.data
-        var base = this.baselayer
-        this.map.eachLayer(function(layer) {
-          if (layer !== base[0] && layer !== base[1]) {
-            layer.remove()
+
+      let { remarks,ip,devType } = this.listQuery;
+      getDeviceList({remarks,ip,devType}).then(response =>{
+        if (response.code === 200) {
+          this.alllist = response.data
+          console.log(this.alllist)
+          var base = this.baselayer
+          this.map.eachLayer(function(layer) {
+            if (layer !== base[0] && layer !== base[1]) {
+              layer.remove()
+            }
+          })
+          var list = []
+          for (i = 0; i < this.alllist.length; i++) {
+            if (Number(this.alllist[i].latitude) === 0 && Number(this.alllist[i].longitude) === 0) {
+              continue
+            }
+            var item = [Number(this.alllist[i].latitude), Number(this.alllist[i].longitude)]
+            list.push(item)
           }
-        })
-        var list = []
-        for (i = 0; i < this.alllist.length; i++) {
-          if (Number(this.alllist[i].lat) === 0 && Number(this.alllist[i].lng) === 0) {
-            continue
+          if (list.length !== 0) {
+            this.setZoom(list)
           }
-          var item = [Number(this.alllist[i].lat), Number(this.alllist[i].lng)]
-          list.push(item)
-        }
-        if (list.length !== 0) {
-          this.setZoom(list)
-        }
-        var Icon
-        for (var i = 0; i < this.alllist.length; i++) {
-          if (this.alllist[i].status === '离线') {
+
+          var Icon
+          for (var i = 0; i < this.alllist.length; i++) {
+          if (this.alllist[i].statusName === '在线') {
             Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-offline.png'), // 灰
+              iconUrl: require('../../assets/global_images/online.png'),
               iconSize: [40, 40]
             })
-          } else if (this.alllist[i].status === '超时') {
+          } else if (this.alllist[i].statusName === '离线') {
             Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-timeout.png'), // 橙
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '停车') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-stop.png'), // 黄
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '行驶') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-online.png'), // 绿
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '报警') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-alarm.png'), // 红
+              iconUrl: require('../../assets/global_images/offline.png'),
               iconSize: [40, 40]
             })
           }
           var myIcon = L.divIcon({
-            html: '<div style="font-size: 13px;font-weight: bold;padding-top: 17px;text-align:center;"> ' + this.alllist[i].deptName + '_' + this.alllist[i].description + '</div>',
+            html: '<div style="font-size: 13px;font-weight: bold;padding-top: 17px;text-align:center;"> ' + this.alllist[i].devCode + '_' + this.alllist[i].remarks + '</div>',
             className: '',
             iconSize: [100, 15]
           })
-          L.marker([this.alllist[i].lat, this.alllist[i].lng], { icon: myIcon }).addTo(this.map)
+          L.marker([this.alllist[i].latitude, this.alllist[i].longitude], { icon: myIcon }).addTo(this.map)
           var str = '<div style="font-size: 15px;padding: 6px"> <div style="font-weight: bold;padding-bottom: 10px">设备位置概要信息</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">描述</label>' + this.alllist[i].description + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">类型</label>' + this.alllist[i].carTypeName + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">单位</label>' + this.alllist[i].deptName + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">状态</label>' + this.alllist[i].status + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">定位</label>' + this.alllist[i].lng + ' , ' + this.alllist[i].lat + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">时间</label>' + this.alllist[i].upTime + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">速度</label>' + this.alllist[i].speed + '(km/h)</div>' +
-            '<div style="padding-top: 8px"><button style="margin-left: 80px;background-color: #42b983;border-color: #42b983;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px"  id="btndetail">详情</button>' +
-            '<button style="margin-right: 5px;margin-left: 5px;background-color: #409eff;border-color: #409eff;' +
-            'color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="btntrack">跟踪</button>' +
-            '<button style="background-color: #e6a23c;border-color: #e6a23c;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="btntrail">轨迹</button></div></div>'
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备号</label>' + this.alllist[i].devCode + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备名称</label>' + this.alllist[i].devName + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备ip</label>' + this.alllist[i].ip + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备类型</label>' + this.alllist[i].devTypeName + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备状态</label>' + this.alllist[i].statusName + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">设备经纬度</label>' + this.alllist[i].longitude + ' , ' + this.alllist[i].latitude + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">安装时间</label>' + this.alllist[i].installTime + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">详细位置</label>' + this.alllist[i].detailLocation + '</div>' +
+            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">备注</label>' + this.alllist[i].remarks + '</div>' +
+            '<div style="padding-top: 8px"></div></div>'
+            // <button style="margin-left: 80px;background-color: #42b983;border-color: #42b983;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="btndetail">详情</button>
           var popup = L.popup().setContent(str)
-          var marker = L.marker([this.alllist[i].lat, this.alllist[i].lng], {
+          var marker = L.marker([this.alllist[i].latitude, this.alllist[i].longitude], {
             icon: Icon,
             slug: this.alllist[i],
-            rotationAngle: this.alllist[i].direction,
+            // rotationAngle: this.alllist[i].direction,
             zIndexOffset: 100000
           }).addTo(this.map).bindPopup(popup)
-
           var that = this
           marker.on('click', function(e) {
             document.getElementById('btndetail').onclick = function() {
               that.detail(e.sourceTarget.options.slug.carId)
             }
-            document.getElementById('btntrack').onclick = function() {
-              that.track(e.sourceTarget.options.slug.carId)
-            }
-            document.getElementById('btntrail').onclick = function() {
-              that.trail(e.sourceTarget.options.slug.carId, e.sourceTarget.options.slug)
-            }
           })
         }
-      })
-    },
-    fetchCar(isNowPage = true) {
-      // this.listLoading = true
-      offlineCount(this.listQuery).then(response => {
-        this.online = response.data.online
-        this.offline = response.data.offline
-      })
-      this.sec = Number(this.refresh)
-      if (!isNowPage) {
-        this.listQuery.offset = 1
-      }
-      getOverviewList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        // this.listLoading = false
-      })
-      getOverviewAllList(this.listQuery).then(response => {
-        this.alllist = response.data
-        var base = this.baselayer
-        this.map.eachLayer(function(layer) {
-          if (layer !== base[0] && layer !== base[1]) {
-            layer.remove()
-          }
-        })
-        var list = []
-        for (i = 0; i < this.alllist.length; i++) {
-          if (Number(this.alllist[i].lat) === 0 && Number(this.alllist[i].lng) === 0) {
-            continue
-          }
-          var item = [Number(this.alllist[i].lat), Number(this.alllist[i].lng)]
-          list.push(item)
-        }
-        var Icon
-        for (var i = 0; i < this.alllist.length; i++) {
-          if (this.alllist[i].status === '离线') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-offline.png'), // 灰
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '超时') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-timeout.png'), // 橙
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '停车') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-stop.png'), // 黄
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '行驶') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-online.png'), // 绿
-              iconSize: [40, 40]
-            })
-          } else if (this.alllist[i].status === '报警') {
-            Icon = L.icon({
-              iconUrl: require('../../assets/global_images/car-alarm.png'), // 红
-              iconSize: [40, 40]
-            })
-          }
-          var myIcon = L.divIcon({
-            html: '<div style="font-size: 13px;font-weight: bold;padding-top: 17px;text-align:center;"> ' + this.alllist[i].deptName + '_' + this.alllist[i].description + '</div>',
-            className: '',
-            iconSize: [100, 15]
-          })
-          L.marker([this.alllist[i].lat, this.alllist[i].lng], { icon: myIcon }).addTo(this.map)
-          var str = '<div style="font-size: 15px;padding: 6px"> <div style="font-weight: bold;padding-bottom: 10px">车辆位置概要信息</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">描述</label>' + this.alllist[i].description + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">类型</label>' + this.alllist[i].carTypeName + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">单位</label>' + this.alllist[i].deptName + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">状态</label>' + this.alllist[i].status + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">定位</label>' + this.alllist[i].lng + ' , ' + this.alllist[i].lat + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">时间</label>' + this.alllist[i].upTime + '</div>' +
-            '<div style="padding-bottom: 6px"><label style="font-weight: bold;padding-right: 15px">速度</label>' + this.alllist[i].speed + '(km/h)</div>' +
-            '<div style="padding-top: 8px"><button style="margin-left: 80px;background-color: #42b983;border-color: #42b983;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px"  id="btndetail">详情</button>' +
-            '<button style="margin-right: 5px;margin-left: 5px;background-color: #409eff;border-color: #409eff;' +
-            'color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="btntrack">跟踪</button>' +
-            '<button style="background-color: #e6a23c;border-color: #e6a23c;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="btntrail">轨迹</button></div></div>'
-          var popup = L.popup().setContent(str)
-          var marker = L.marker([this.alllist[i].lat, this.alllist[i].lng], {
-            icon: Icon,
-            slug: this.alllist[i],
-            rotationAngle: this.alllist[i].direction,
-            zIndexOffset: 100000
-          }).addTo(this.map).bindPopup(popup)
-
-          var that = this
-          marker.on('click', function(e) {
-            document.getElementById('btndetail').onclick = function() {
-              that.detail(e.sourceTarget.options.slug.carId)
-            }
-            document.getElementById('btntrack').onclick = function() {
-              that.track(e.sourceTarget.options.slug.carId)
-            }
-            document.getElementById('btntrail').onclick = function() {
-              that.trail(e.sourceTarget.options.slug.carId, e.sourceTarget.options.slug)
-            }
-          })
         }
       })
     },
@@ -528,19 +411,25 @@
   .table{
     margin-bottom: 20px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .pagination-container{
+    width: 460px;
+    display: inline;
+    position: fixed;
+    left: 235px;
+    bottom: 5px;
+  }
   .table{
     width: 460px;
-    height: 70vh;
+    height: 525px;
     z-index: 10000;
     margin-top: 40px;
     position: absolute;
     left:20px;
-    top:20px;
+    top:10px;
+    overflow: auto
   }
   .rightcard{
     width: 750px;
@@ -548,7 +437,7 @@
     z-index: 10000;
     position: absolute;
     left:500px;
-    top:20px;
+    top:10px;
     background-color: rgba(238, 238, 238, 0.93);
   }
   .table-bottom{
@@ -573,10 +462,13 @@
     z-index: 10000;
     position: absolute;
     left:20px;
-    top:20px;
+    top:10px;
   }
   #map {
     width:100%;
-    height:80vh;
+    height:82vh;
+  }
+  .el-form-item {
+    margin-bottom:5px;
   }
 </style>