diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f2b7150..30732ae 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -1,43 +1,56 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/busConfig/wellcoverConfig/list')" label="井盖状态监测仪" name="wellcover">
+      <!-- v-if="hasPerm('/busConfig/wellcoverConfig/list')" -->
+      <el-tab-pane label="井盖状态监测仪" name="wellcover">
         <list-wellcover-config ref="wellcoverConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
+      <!-- v-if="hasPerm('/busConfig/liquidConfig/list')" -->
+      <el-tab-pane label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+      <!-- v-if="hasPerm('/busConfig/gasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端" name="gas">
         <list-gas-config ref="gasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+      <!-- v-if="hasPerm('/busConfig/harmfulConfig/list')" -->
+      <el-tab-pane label="有害气体监测仪" name="harmful">
         <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+      <!-- v-if="hasPerm('/busConfig/tempConfig/list')" -->
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
         <list-temp-config ref="tempConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+      <!-- v-if="hasPerm('/busConfig/digConfig/list')" -->
+      <el-tab-pane label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声记录仪" name="noise">
+      <!-- v-if="hasPerm('/busConfig/noiseConfig/list')" -->
+      <el-tab-pane label="噪声记录仪" name="noise">
         <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+      <!-- v-if="hasPerm('/busConfig/liquidGasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端(一体化)" name="liquidgas">
         <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
+      <!-- v-if="hasPerm('/busConfig/tubeConfig/list')" -->
+      <el-tab-pane label="管盯" name="tube">
         <list-tube-config ref="tubeConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+      <!-- v-if="hasPerm('/busConfig/H2sConfig/list')" -->
+      <el-tab-pane label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+      <!-- v-if="hasPerm('/busConfig/wellliquidConfig/list')" -->
+      <el-tab-pane label="井盖液位一体机" name="wellliquid">
         <list-wellliquid-config ref="wellliquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/combustibleGasConfig/list')" label="点型可燃气体探测器" name="combustibleGas">
+      <!-- v-if="hasPerm('/busConfig/combustibleGasConfig/list')" -->
+      <el-tab-pane label="点型可燃气体探测器" name="combustibleGas">
         <list-combustible-gas-config ref="combustibleGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/pressConfig/list')" label="压力监测终端" name="press">
+      <!-- v-if="hasPerm('/busConfig/pressConfig/list')" -->
+      <el-tab-pane label="压力监测终端" name="press">
         <List-press-config ref="pressConfig" />
       </el-tab-pane>
     </el-tabs>
@@ -102,33 +115,33 @@
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/busConfig/wellcoverConfig/list')) {
+      // if (hasPermission('/busConfig/wellcoverConfig/list')) {
         this.activeName = 'wellcover'
-      } else if (hasPermission('/busConfig/liquidConfig/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/busConfig/gasConfig/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/busConfig/harmfulConfig/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/busConfig/tempConfig/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/busConfig/digConfig/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/busConfig/noiseConfig/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/busConfig/tubeConfig/list')) {
-        this.activeName = 'tube'
-      } else if (hasPermission('/busConfig/h2sConfig/list')) {
-        this.activeName = 'h2s'
-      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
-        this.activeName = 'wellliquid'
-      } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
-        this.activeName = 'combustibleGas'
-      } else if (hasPermission('/busConfig/pressConfig/list')) {
-        this.activeName = 'press'
-      }
+      // } else if (hasPermission('/busConfig/liquidConfig/list')) {
+      //   this.activeName = 'liquid'
+      // } else if (hasPermission('/busConfig/gasConfig/list')) {
+      //   this.activeName = 'gas'
+      // } else if (hasPermission('/busConfig/harmfulConfig/list')) {
+      //   this.activeName = 'harmful'
+      // } else if (hasPermission('/busConfig/tempConfig/list')) {
+      //   this.activeName = 'temp'
+      // } else if (hasPermission('/busConfig/digConfig/list')) {
+      //   this.activeName = 'dig'
+      // } else if (hasPermission('/busConfig/noiseConfig/list')) {
+      //   this.activeName = 'noise'
+      // } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+      //   this.activeName = 'liquidgas'
+      // } else if (hasPermission('/busConfig/tubeConfig/list')) {
+      //   this.activeName = 'tube'
+      // } else if (hasPermission('/busConfig/h2sConfig/list')) {
+      //   this.activeName = 'h2s'
+      // } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+      //   this.activeName = 'wellliquid'
+      // } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
+      //   this.activeName = 'combustibleGas'
+      // } else if (hasPermission('/busConfig/pressConfig/list')) {
+      //   this.activeName = 'press'
+      // }
     }
   }
 }

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f2b7150..30732ae 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -1,43 +1,56 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/busConfig/wellcoverConfig/list')" label="井盖状态监测仪" name="wellcover">
+      <!-- v-if="hasPerm('/busConfig/wellcoverConfig/list')" -->
+      <el-tab-pane label="井盖状态监测仪" name="wellcover">
         <list-wellcover-config ref="wellcoverConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
+      <!-- v-if="hasPerm('/busConfig/liquidConfig/list')" -->
+      <el-tab-pane label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+      <!-- v-if="hasPerm('/busConfig/gasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端" name="gas">
         <list-gas-config ref="gasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+      <!-- v-if="hasPerm('/busConfig/harmfulConfig/list')" -->
+      <el-tab-pane label="有害气体监测仪" name="harmful">
         <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+      <!-- v-if="hasPerm('/busConfig/tempConfig/list')" -->
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
         <list-temp-config ref="tempConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+      <!-- v-if="hasPerm('/busConfig/digConfig/list')" -->
+      <el-tab-pane label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声记录仪" name="noise">
+      <!-- v-if="hasPerm('/busConfig/noiseConfig/list')" -->
+      <el-tab-pane label="噪声记录仪" name="noise">
         <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+      <!-- v-if="hasPerm('/busConfig/liquidGasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端(一体化)" name="liquidgas">
         <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
+      <!-- v-if="hasPerm('/busConfig/tubeConfig/list')" -->
+      <el-tab-pane label="管盯" name="tube">
         <list-tube-config ref="tubeConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+      <!-- v-if="hasPerm('/busConfig/H2sConfig/list')" -->
+      <el-tab-pane label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+      <!-- v-if="hasPerm('/busConfig/wellliquidConfig/list')" -->
+      <el-tab-pane label="井盖液位一体机" name="wellliquid">
         <list-wellliquid-config ref="wellliquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/combustibleGasConfig/list')" label="点型可燃气体探测器" name="combustibleGas">
+      <!-- v-if="hasPerm('/busConfig/combustibleGasConfig/list')" -->
+      <el-tab-pane label="点型可燃气体探测器" name="combustibleGas">
         <list-combustible-gas-config ref="combustibleGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/pressConfig/list')" label="压力监测终端" name="press">
+      <!-- v-if="hasPerm('/busConfig/pressConfig/list')" -->
+      <el-tab-pane label="压力监测终端" name="press">
         <List-press-config ref="pressConfig" />
       </el-tab-pane>
     </el-tabs>
@@ -102,33 +115,33 @@
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/busConfig/wellcoverConfig/list')) {
+      // if (hasPermission('/busConfig/wellcoverConfig/list')) {
         this.activeName = 'wellcover'
-      } else if (hasPermission('/busConfig/liquidConfig/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/busConfig/gasConfig/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/busConfig/harmfulConfig/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/busConfig/tempConfig/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/busConfig/digConfig/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/busConfig/noiseConfig/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/busConfig/tubeConfig/list')) {
-        this.activeName = 'tube'
-      } else if (hasPermission('/busConfig/h2sConfig/list')) {
-        this.activeName = 'h2s'
-      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
-        this.activeName = 'wellliquid'
-      } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
-        this.activeName = 'combustibleGas'
-      } else if (hasPermission('/busConfig/pressConfig/list')) {
-        this.activeName = 'press'
-      }
+      // } else if (hasPermission('/busConfig/liquidConfig/list')) {
+      //   this.activeName = 'liquid'
+      // } else if (hasPermission('/busConfig/gasConfig/list')) {
+      //   this.activeName = 'gas'
+      // } else if (hasPermission('/busConfig/harmfulConfig/list')) {
+      //   this.activeName = 'harmful'
+      // } else if (hasPermission('/busConfig/tempConfig/list')) {
+      //   this.activeName = 'temp'
+      // } else if (hasPermission('/busConfig/digConfig/list')) {
+      //   this.activeName = 'dig'
+      // } else if (hasPermission('/busConfig/noiseConfig/list')) {
+      //   this.activeName = 'noise'
+      // } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+      //   this.activeName = 'liquidgas'
+      // } else if (hasPermission('/busConfig/tubeConfig/list')) {
+      //   this.activeName = 'tube'
+      // } else if (hasPermission('/busConfig/h2sConfig/list')) {
+      //   this.activeName = 'h2s'
+      // } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+      //   this.activeName = 'wellliquid'
+      // } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
+      //   this.activeName = 'combustibleGas'
+      // } else if (hasPermission('/busConfig/pressConfig/list')) {
+      //   this.activeName = 'press'
+      // }
     }
   }
 }
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 1245b35..4261438 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -222,6 +222,9 @@
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
+    if(this.$route.query.status === 'offline') {
+       this.listQuery.isOnline = '0'
+    }
     // 如果参数中有井编号，则将查询条件填入，否则正常
     if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
       this.listQuery.keywords = this.$route.query.wellCode

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f2b7150..30732ae 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -1,43 +1,56 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/busConfig/wellcoverConfig/list')" label="井盖状态监测仪" name="wellcover">
+      <!-- v-if="hasPerm('/busConfig/wellcoverConfig/list')" -->
+      <el-tab-pane label="井盖状态监测仪" name="wellcover">
         <list-wellcover-config ref="wellcoverConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
+      <!-- v-if="hasPerm('/busConfig/liquidConfig/list')" -->
+      <el-tab-pane label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+      <!-- v-if="hasPerm('/busConfig/gasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端" name="gas">
         <list-gas-config ref="gasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+      <!-- v-if="hasPerm('/busConfig/harmfulConfig/list')" -->
+      <el-tab-pane label="有害气体监测仪" name="harmful">
         <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+      <!-- v-if="hasPerm('/busConfig/tempConfig/list')" -->
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
         <list-temp-config ref="tempConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+      <!-- v-if="hasPerm('/busConfig/digConfig/list')" -->
+      <el-tab-pane label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声记录仪" name="noise">
+      <!-- v-if="hasPerm('/busConfig/noiseConfig/list')" -->
+      <el-tab-pane label="噪声记录仪" name="noise">
         <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+      <!-- v-if="hasPerm('/busConfig/liquidGasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端(一体化)" name="liquidgas">
         <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
+      <!-- v-if="hasPerm('/busConfig/tubeConfig/list')" -->
+      <el-tab-pane label="管盯" name="tube">
         <list-tube-config ref="tubeConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+      <!-- v-if="hasPerm('/busConfig/H2sConfig/list')" -->
+      <el-tab-pane label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+      <!-- v-if="hasPerm('/busConfig/wellliquidConfig/list')" -->
+      <el-tab-pane label="井盖液位一体机" name="wellliquid">
         <list-wellliquid-config ref="wellliquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/combustibleGasConfig/list')" label="点型可燃气体探测器" name="combustibleGas">
+      <!-- v-if="hasPerm('/busConfig/combustibleGasConfig/list')" -->
+      <el-tab-pane label="点型可燃气体探测器" name="combustibleGas">
         <list-combustible-gas-config ref="combustibleGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/pressConfig/list')" label="压力监测终端" name="press">
+      <!-- v-if="hasPerm('/busConfig/pressConfig/list')" -->
+      <el-tab-pane label="压力监测终端" name="press">
         <List-press-config ref="pressConfig" />
       </el-tab-pane>
     </el-tabs>
@@ -102,33 +115,33 @@
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/busConfig/wellcoverConfig/list')) {
+      // if (hasPermission('/busConfig/wellcoverConfig/list')) {
         this.activeName = 'wellcover'
-      } else if (hasPermission('/busConfig/liquidConfig/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/busConfig/gasConfig/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/busConfig/harmfulConfig/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/busConfig/tempConfig/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/busConfig/digConfig/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/busConfig/noiseConfig/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/busConfig/tubeConfig/list')) {
-        this.activeName = 'tube'
-      } else if (hasPermission('/busConfig/h2sConfig/list')) {
-        this.activeName = 'h2s'
-      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
-        this.activeName = 'wellliquid'
-      } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
-        this.activeName = 'combustibleGas'
-      } else if (hasPermission('/busConfig/pressConfig/list')) {
-        this.activeName = 'press'
-      }
+      // } else if (hasPermission('/busConfig/liquidConfig/list')) {
+      //   this.activeName = 'liquid'
+      // } else if (hasPermission('/busConfig/gasConfig/list')) {
+      //   this.activeName = 'gas'
+      // } else if (hasPermission('/busConfig/harmfulConfig/list')) {
+      //   this.activeName = 'harmful'
+      // } else if (hasPermission('/busConfig/tempConfig/list')) {
+      //   this.activeName = 'temp'
+      // } else if (hasPermission('/busConfig/digConfig/list')) {
+      //   this.activeName = 'dig'
+      // } else if (hasPermission('/busConfig/noiseConfig/list')) {
+      //   this.activeName = 'noise'
+      // } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+      //   this.activeName = 'liquidgas'
+      // } else if (hasPermission('/busConfig/tubeConfig/list')) {
+      //   this.activeName = 'tube'
+      // } else if (hasPermission('/busConfig/h2sConfig/list')) {
+      //   this.activeName = 'h2s'
+      // } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+      //   this.activeName = 'wellliquid'
+      // } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
+      //   this.activeName = 'combustibleGas'
+      // } else if (hasPermission('/busConfig/pressConfig/list')) {
+      //   this.activeName = 'press'
+      // }
     }
   }
 }
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 1245b35..4261438 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -222,6 +222,9 @@
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
+    if(this.$route.query.status === 'offline') {
+       this.listQuery.isOnline = '0'
+    }
     // 如果参数中有井编号，则将查询条件填入，否则正常
     if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
       this.listQuery.keywords = this.$route.query.wellCode
diff --git a/src/views/wellManage/components/editKkj.vue b/src/views/wellManage/components/editKkj.vue
index 9935e66..c924a89 100644
--- a/src/views/wellManage/components/editKkj.vue
+++ b/src/views/wellManage/components/editKkj.vue
@@ -62,6 +62,7 @@
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      isFirst: true,
       kkjForm: {
         kkjCode: '', // 开孔机编号
         kkjName: '', // 开孔机名称
@@ -129,12 +130,19 @@
           this.companyChange()
         }
       }
+    },
+    'kkjForm.companyId'(val) {
+      if(this.isFirst || !val) {
+        return
+      }
+      this.kkjForm.deptid = ''
     }
   },
   mounted: function() { },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row) {
+      this.isFirst = true
       this.resetForm()
       this.dialogFormVisible = dialogFormVisible
       this.dialogStatus = dialogStatus
@@ -166,6 +174,7 @@
         this.companyChange()
         this.kkjForm.deptid = row.deptid
       }
+      this.isFirst = false
       // this.fetchSecondDeptTree()
     },
     companyChange() {

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f2b7150..30732ae 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -1,43 +1,56 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/busConfig/wellcoverConfig/list')" label="井盖状态监测仪" name="wellcover">
+      <!-- v-if="hasPerm('/busConfig/wellcoverConfig/list')" -->
+      <el-tab-pane label="井盖状态监测仪" name="wellcover">
         <list-wellcover-config ref="wellcoverConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
+      <!-- v-if="hasPerm('/busConfig/liquidConfig/list')" -->
+      <el-tab-pane label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+      <!-- v-if="hasPerm('/busConfig/gasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端" name="gas">
         <list-gas-config ref="gasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+      <!-- v-if="hasPerm('/busConfig/harmfulConfig/list')" -->
+      <el-tab-pane label="有害气体监测仪" name="harmful">
         <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+      <!-- v-if="hasPerm('/busConfig/tempConfig/list')" -->
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
         <list-temp-config ref="tempConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+      <!-- v-if="hasPerm('/busConfig/digConfig/list')" -->
+      <el-tab-pane label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声记录仪" name="noise">
+      <!-- v-if="hasPerm('/busConfig/noiseConfig/list')" -->
+      <el-tab-pane label="噪声记录仪" name="noise">
         <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+      <!-- v-if="hasPerm('/busConfig/liquidGasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端(一体化)" name="liquidgas">
         <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
+      <!-- v-if="hasPerm('/busConfig/tubeConfig/list')" -->
+      <el-tab-pane label="管盯" name="tube">
         <list-tube-config ref="tubeConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+      <!-- v-if="hasPerm('/busConfig/H2sConfig/list')" -->
+      <el-tab-pane label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+      <!-- v-if="hasPerm('/busConfig/wellliquidConfig/list')" -->
+      <el-tab-pane label="井盖液位一体机" name="wellliquid">
         <list-wellliquid-config ref="wellliquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/combustibleGasConfig/list')" label="点型可燃气体探测器" name="combustibleGas">
+      <!-- v-if="hasPerm('/busConfig/combustibleGasConfig/list')" -->
+      <el-tab-pane label="点型可燃气体探测器" name="combustibleGas">
         <list-combustible-gas-config ref="combustibleGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/pressConfig/list')" label="压力监测终端" name="press">
+      <!-- v-if="hasPerm('/busConfig/pressConfig/list')" -->
+      <el-tab-pane label="压力监测终端" name="press">
         <List-press-config ref="pressConfig" />
       </el-tab-pane>
     </el-tabs>
@@ -102,33 +115,33 @@
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/busConfig/wellcoverConfig/list')) {
+      // if (hasPermission('/busConfig/wellcoverConfig/list')) {
         this.activeName = 'wellcover'
-      } else if (hasPermission('/busConfig/liquidConfig/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/busConfig/gasConfig/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/busConfig/harmfulConfig/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/busConfig/tempConfig/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/busConfig/digConfig/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/busConfig/noiseConfig/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/busConfig/tubeConfig/list')) {
-        this.activeName = 'tube'
-      } else if (hasPermission('/busConfig/h2sConfig/list')) {
-        this.activeName = 'h2s'
-      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
-        this.activeName = 'wellliquid'
-      } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
-        this.activeName = 'combustibleGas'
-      } else if (hasPermission('/busConfig/pressConfig/list')) {
-        this.activeName = 'press'
-      }
+      // } else if (hasPermission('/busConfig/liquidConfig/list')) {
+      //   this.activeName = 'liquid'
+      // } else if (hasPermission('/busConfig/gasConfig/list')) {
+      //   this.activeName = 'gas'
+      // } else if (hasPermission('/busConfig/harmfulConfig/list')) {
+      //   this.activeName = 'harmful'
+      // } else if (hasPermission('/busConfig/tempConfig/list')) {
+      //   this.activeName = 'temp'
+      // } else if (hasPermission('/busConfig/digConfig/list')) {
+      //   this.activeName = 'dig'
+      // } else if (hasPermission('/busConfig/noiseConfig/list')) {
+      //   this.activeName = 'noise'
+      // } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+      //   this.activeName = 'liquidgas'
+      // } else if (hasPermission('/busConfig/tubeConfig/list')) {
+      //   this.activeName = 'tube'
+      // } else if (hasPermission('/busConfig/h2sConfig/list')) {
+      //   this.activeName = 'h2s'
+      // } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+      //   this.activeName = 'wellliquid'
+      // } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
+      //   this.activeName = 'combustibleGas'
+      // } else if (hasPermission('/busConfig/pressConfig/list')) {
+      //   this.activeName = 'press'
+      // }
     }
   }
 }
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 1245b35..4261438 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -222,6 +222,9 @@
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
+    if(this.$route.query.status === 'offline') {
+       this.listQuery.isOnline = '0'
+    }
     // 如果参数中有井编号，则将查询条件填入，否则正常
     if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
       this.listQuery.keywords = this.$route.query.wellCode
diff --git a/src/views/wellManage/components/editKkj.vue b/src/views/wellManage/components/editKkj.vue
index 9935e66..c924a89 100644
--- a/src/views/wellManage/components/editKkj.vue
+++ b/src/views/wellManage/components/editKkj.vue
@@ -62,6 +62,7 @@
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      isFirst: true,
       kkjForm: {
         kkjCode: '', // 开孔机编号
         kkjName: '', // 开孔机名称
@@ -129,12 +130,19 @@
           this.companyChange()
         }
       }
+    },
+    'kkjForm.companyId'(val) {
+      if(this.isFirst || !val) {
+        return
+      }
+      this.kkjForm.deptid = ''
     }
   },
   mounted: function() { },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row) {
+      this.isFirst = true
       this.resetForm()
       this.dialogFormVisible = dialogFormVisible
       this.dialogStatus = dialogStatus
@@ -166,6 +174,7 @@
         this.companyChange()
         this.kkjForm.deptid = row.deptid
       }
+      this.isFirst = false
       // this.fetchSecondDeptTree()
     },
     companyChange() {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index ad58a48..53036cc 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+              <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/.gitignore b/.gitignore
index 78a752d..defec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+dist*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 571b0e4..015fcb1 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -58,7 +58,8 @@
   computed: {
     showTabList() { // 根据权限获取可见tab
       return this.tabList.filter(item => {
-        return this.hasPerm(item.permission)
+        // return this.hasPerm(item.permission)
+        return true
       })
     }
   },
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index aaf253b..3ca2c22 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -51,7 +51,8 @@
           flags: '个',
           icon: 'icon-well',
           color: '#40c9c6',
-          permission: '/well/list'
+          permission: '/well/list',
+          path: '/wellList'
         },
         {
           title: '设备',
@@ -59,7 +60,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#36a3f7',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList'
         },
         {
           title: '今日数据',
@@ -67,7 +69,8 @@
           flags: '条',
           icon: 'icon-database',
           color: '#1ed8f3',
-          permission: '/data'
+          permission: '/data',
+          path: '/dataManage'
         },
         {
           title: '离线设备',
@@ -75,7 +78,8 @@
           flags: '个',
           icon: 'icon-device',
           color: '#676767',
-          permission: '/device/list'
+          permission: '/device/list',
+          path: '/deviceList?status=offline'
         },
         {
           title: '当前报警',
@@ -83,7 +87,8 @@
           flags: '条',
           icon: 'icon-alarm',
           color: '#f4516c',
-          permission: '/alarm/now'
+          permission: '/alarm/now',
+          path: '/alarmNow'
         }
       ]
     }
@@ -127,6 +132,12 @@
         this.dataGroup[2].context = count + ''
         console.log('今日总数', this.dataGroup[2].context)
       })
+    },
+    // 跳转页面
+    goPage(card) {
+    this.$router.push({
+      path: card.path
+    })
     }
   }
 }
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index f2b7150..30732ae 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -1,43 +1,56 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/busConfig/wellcoverConfig/list')" label="井盖状态监测仪" name="wellcover">
+      <!-- v-if="hasPerm('/busConfig/wellcoverConfig/list')" -->
+      <el-tab-pane label="井盖状态监测仪" name="wellcover">
         <list-wellcover-config ref="wellcoverConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
+      <!-- v-if="hasPerm('/busConfig/liquidConfig/list')" -->
+      <el-tab-pane label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+      <!-- v-if="hasPerm('/busConfig/gasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端" name="gas">
         <list-gas-config ref="gasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+      <!-- v-if="hasPerm('/busConfig/harmfulConfig/list')" -->
+      <el-tab-pane label="有害气体监测仪" name="harmful">
         <list-harmful-config ref="harmfulConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+      <!-- v-if="hasPerm('/busConfig/tempConfig/list')" -->
+      <el-tab-pane label="温湿度监测仪" name="temphumidity">
         <list-temp-config ref="tempConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+      <!-- v-if="hasPerm('/busConfig/digConfig/list')" -->
+      <el-tab-pane label="开挖监测仪" name="dig">
         <list-dig-config ref="digConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声记录仪" name="noise">
+      <!-- v-if="hasPerm('/busConfig/noiseConfig/list')" -->
+      <el-tab-pane label="噪声记录仪" name="noise">
         <list-noise-config ref="noiseConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/liquidGasConfig/list')" label="燃气智能监测终端(一体化)" name="liquidgas">
+      <!-- v-if="hasPerm('/busConfig/liquidGasConfig/list')" -->
+      <el-tab-pane label="燃气智能监测终端(一体化)" name="liquidgas">
         <list-liquid-gas-config ref="liquidGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/tubeConfig/list')" label="管盯" name="tube">
+      <!-- v-if="hasPerm('/busConfig/tubeConfig/list')" -->
+      <el-tab-pane label="管盯" name="tube">
         <list-tube-config ref="tubeConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/H2sConfig/list')" label="硫化氢检测终端" name="h2s">
+      <!-- v-if="hasPerm('/busConfig/H2sConfig/list')" -->
+      <el-tab-pane label="硫化氢检测终端" name="h2s">
         <list-h2s-config ref="h2sConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/wellliquidConfig/list')" label="井盖液位一体机" name="wellliquid">
+      <!-- v-if="hasPerm('/busConfig/wellliquidConfig/list')" -->
+      <el-tab-pane label="井盖液位一体机" name="wellliquid">
         <list-wellliquid-config ref="wellliquidConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/combustibleGasConfig/list')" label="点型可燃气体探测器" name="combustibleGas">
+      <!-- v-if="hasPerm('/busConfig/combustibleGasConfig/list')" -->
+      <el-tab-pane label="点型可燃气体探测器" name="combustibleGas">
         <list-combustible-gas-config ref="combustibleGasConfig" />
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/busConfig/pressConfig/list')" label="压力监测终端" name="press">
+      <!-- v-if="hasPerm('/busConfig/pressConfig/list')" -->
+      <el-tab-pane label="压力监测终端" name="press">
         <List-press-config ref="pressConfig" />
       </el-tab-pane>
     </el-tabs>
@@ -102,33 +115,33 @@
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/busConfig/wellcoverConfig/list')) {
+      // if (hasPermission('/busConfig/wellcoverConfig/list')) {
         this.activeName = 'wellcover'
-      } else if (hasPermission('/busConfig/liquidConfig/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/busConfig/gasConfig/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/busConfig/harmfulConfig/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/busConfig/tempConfig/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/busConfig/digConfig/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/busConfig/noiseConfig/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/busConfig/tubeConfig/list')) {
-        this.activeName = 'tube'
-      } else if (hasPermission('/busConfig/h2sConfig/list')) {
-        this.activeName = 'h2s'
-      } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
-        this.activeName = 'wellliquid'
-      } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
-        this.activeName = 'combustibleGas'
-      } else if (hasPermission('/busConfig/pressConfig/list')) {
-        this.activeName = 'press'
-      }
+      // } else if (hasPermission('/busConfig/liquidConfig/list')) {
+      //   this.activeName = 'liquid'
+      // } else if (hasPermission('/busConfig/gasConfig/list')) {
+      //   this.activeName = 'gas'
+      // } else if (hasPermission('/busConfig/harmfulConfig/list')) {
+      //   this.activeName = 'harmful'
+      // } else if (hasPermission('/busConfig/tempConfig/list')) {
+      //   this.activeName = 'temp'
+      // } else if (hasPermission('/busConfig/digConfig/list')) {
+      //   this.activeName = 'dig'
+      // } else if (hasPermission('/busConfig/noiseConfig/list')) {
+      //   this.activeName = 'noise'
+      // } else if (hasPermission('/busConfig/liquidGasConfig/list')) {
+      //   this.activeName = 'liquidgas'
+      // } else if (hasPermission('/busConfig/tubeConfig/list')) {
+      //   this.activeName = 'tube'
+      // } else if (hasPermission('/busConfig/h2sConfig/list')) {
+      //   this.activeName = 'h2s'
+      // } else if (hasPermission('/busConfig/wellliquidConfig/list')) {
+      //   this.activeName = 'wellliquid'
+      // } else if (hasPermission('/busConfig/combustibleGasConfig/list')) {
+      //   this.activeName = 'combustibleGas'
+      // } else if (hasPermission('/busConfig/pressConfig/list')) {
+      //   this.activeName = 'press'
+      // }
     }
   }
 }
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 1245b35..4261438 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -222,6 +222,9 @@
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
+    if(this.$route.query.status === 'offline') {
+       this.listQuery.isOnline = '0'
+    }
     // 如果参数中有井编号，则将查询条件填入，否则正常
     if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
       this.listQuery.keywords = this.$route.query.wellCode
diff --git a/src/views/wellManage/components/editKkj.vue b/src/views/wellManage/components/editKkj.vue
index 9935e66..c924a89 100644
--- a/src/views/wellManage/components/editKkj.vue
+++ b/src/views/wellManage/components/editKkj.vue
@@ -62,6 +62,7 @@
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      isFirst: true,
       kkjForm: {
         kkjCode: '', // 开孔机编号
         kkjName: '', // 开孔机名称
@@ -129,12 +130,19 @@
           this.companyChange()
         }
       }
+    },
+    'kkjForm.companyId'(val) {
+      if(this.isFirst || !val) {
+        return
+      }
+      this.kkjForm.deptid = ''
     }
   },
   mounted: function() { },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row) {
+      this.isFirst = true
       this.resetForm()
       this.dialogFormVisible = dialogFormVisible
       this.dialogStatus = dialogStatus
@@ -166,6 +174,7 @@
         this.companyChange()
         this.kkjForm.deptid = row.deptid
       }
+      this.isFirst = false
       // this.fetchSecondDeptTree()
     },
     companyChange() {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index ad58a48..53036cc 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+              <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/wellManage/postionCorrectWell.vue b/src/views/wellManage/postionCorrectWell.vue
index 928293d..74fc19c 100644
--- a/src/views/wellManage/postionCorrectWell.vue
+++ b/src/views/wellManage/postionCorrectWell.vue
@@ -138,7 +138,7 @@
     mapReady(map) {
       this.map = map
       var that = this
-      this.fetchWellList() // 加载全部井
+      // this.fetchWellList() // 加载全部井
       map.on('click', function(e) {
         console.log(e)
         that.postionForm.longitude = e.lnglat.lng
@@ -177,13 +177,13 @@
       this.clearInfoWindow()
       this.clearSearch()
       this.layerWindowShow = false
-      this.fetchWellList()
+      // this.fetchWellList()
     },
     closePopupLocation() {
       const { map } = this
       map.remove(this.locationMarker)
       this.locationWindowShow = false
-      this.fetchWellList()
+      // this.fetchWellList()
       setTimeout(() => {
         this.moveInfoShow(this.locationWellId, this.locationCoordinates)
       }, 200)
@@ -193,13 +193,44 @@
       if (keywords === '') {
         this.$message.warning('搜索条件不能为空')
       } else {
-        this.resultList = this.markers.filter(item => {
-          if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) {
-            return true
-          } else {
-            return false
+        // this.resultList = this.markers.filter(item => {
+        //   if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) {
+        //     return true
+        //   } else {
+        //     return false
+        //   }
+        // })
+        this.loading = true
+      getWellList({keywords}).then(response => {
+        this.loading = false
+        if (response.code === 200) {
+          const wells = response.data
+          console.log(response.data, 'response.dataresponse.data')
+          if (wells.length > 0) {
+            this.markers = []
+            for (const well of wells) {
+              const marker = {
+                ...well,
+                lnglat: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                icon: this.commonIcon,
+                visible: true,
+                wellStatus: 'normal'
+              }
+              this.markers.push(marker)
+              this.searchMarkers = this.markers
+            }
+            if (this.type === 'massMarkers') {
+              this.initMassMarker() // 加载海量点
+            } else if (this.type === 'cluster' && this.checkedLayer.indexOf('well') > -1) {
+              this.mountClusters() // 加载聚合点
+            }
           }
-        })
+        }
+      })
+
+
+
+
       }
     },
     // 搜索结果页面变化，触发地图展示列表中所有