diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4971eff..cfb9847 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -70,6 +70,11 @@
       this.caclActive()
     }
   },
+  mounted() {
+    if (this.$route.query && this.$route.query.deviceType) {
+      this.changeTab(this.$route.query.deviceType)
+    }
+  },
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {

diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4971eff..cfb9847 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -70,6 +70,11 @@
       this.caclActive()
     }
   },
+  mounted() {
+    if (this.$route.query && this.$route.query.deviceType) {
+      this.changeTab(this.$route.query.deviceType)
+    }
+  },
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index c425a86..4b199c4 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -160,6 +160,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },

diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4971eff..cfb9847 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -70,6 +70,11 @@
       this.caclActive()
     }
   },
+  mounted() {
+    if (this.$route.query && this.$route.query.deviceType) {
+      this.changeTab(this.$route.query.deviceType)
+    }
+  },
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index c425a86..4b199c4 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -160,6 +160,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 8186890..5c02f41 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -14,7 +14,7 @@
       <el-col :span="12">
         <div class="tableStyle">
           <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
+            <el-table-column prop="name" label="报警类型" />
             <el-table-column prop="value" label="设备名称" />
           </el-table>
         </div>

diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4971eff..cfb9847 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -70,6 +70,11 @@
       this.caclActive()
     }
   },
+  mounted() {
+    if (this.$route.query && this.$route.query.deviceType) {
+      this.changeTab(this.$route.query.deviceType)
+    }
+  },
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index c425a86..4b199c4 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -160,6 +160,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 8186890..5c02f41 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -14,7 +14,7 @@
       <el-col :span="12">
         <div class="tableStyle">
           <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
+            <el-table-column prop="name" label="报警类型" />
             <el-table-column prop="value" label="设备名称" />
           </el-table>
         </div>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 9e70b3f..9dd4fed 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -25,11 +25,11 @@
           accept=".xls,.xlsx"
           style="display: inline-block"
         >
-          <el-button slot="trigger" size="small">
+          <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
         </el-upload>
-        <el-button v-if="hasPerm('/device/simManage/add')" size="small" @click="add">
+        <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
       </template>
@@ -39,7 +39,7 @@
             <el-button v-if="hasPerm('/device/simManage/update')" type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button v-if="hasPerm('/device/simManage/delete')" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/device/simManage/delete')" size="small" type="text" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -221,7 +221,7 @@
   .edit_btns{
     .edit_btn{
       float:right;
-      //margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+      margin: 0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
 </style>

diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 4971eff..cfb9847 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -70,6 +70,11 @@
       this.caclActive()
     }
   },
+  mounted() {
+    if (this.$route.query && this.$route.query.deviceType) {
+      this.changeTab(this.$route.query.deviceType)
+    }
+  },
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index c425a86..4b199c4 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -160,6 +160,8 @@
       if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
         this.fetchData()
+      } else {
+        this.fetchData()
       }
     }
   },
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 8186890..5c02f41 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -14,7 +14,7 @@
       <el-col :span="12">
         <div class="tableStyle">
           <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
+            <el-table-column prop="name" label="报警类型" />
             <el-table-column prop="value" label="设备名称" />
           </el-table>
         </div>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 9e70b3f..9dd4fed 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -25,11 +25,11 @@
           accept=".xls,.xlsx"
           style="display: inline-block"
         >
-          <el-button slot="trigger" size="small">
+          <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
         </el-upload>
-        <el-button v-if="hasPerm('/device/simManage/add')" size="small" @click="add">
+        <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
       </template>
@@ -39,7 +39,7 @@
             <el-button v-if="hasPerm('/device/simManage/update')" type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button v-if="hasPerm('/device/simManage/delete')" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/device/simManage/delete')" size="small" type="text" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -221,7 +221,7 @@
   .edit_btns{
     .edit_btn{
       float:right;
-      //margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+      margin: 0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
 </style>
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index 1f9a309..f4e2a49 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -78,7 +78,7 @@
       baseLayer: 'gaode_vec', // 底图图层
       layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表
       checkedLayer: [], // 选中的图层
-      center: ['117.87', '25.68'], // 地图中心
+      center: ['114.88', '25.68'], // 地图中心
       // center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
       zoom: 12, // 地图缩放比例
       type: this.baseConfig.showPointType, // 加载数据方式：massMarkers海量点或cluster聚合点
@@ -286,7 +286,7 @@
         const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
           name: '三维' + this.layerName[i],
           popup: 'all',
-          url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRqDataServer/MapServer/' + i,
+          url: 'http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/' + i,
           minimumLevel: 19,
           symbol: {
             type: 'polylineVolumeP',
@@ -307,7 +307,7 @@
         window.map.addLayer(wfsLayer)
         // 二维管线
         const queryLineserver = new mars3d.query.QueryArcServer({
-          url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRqDataServer/MapServer/' + i,
+          url: 'http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/' + i,
           popup: 'all',
           pageSize: 3000
         })
@@ -342,7 +342,7 @@
     initPoint(condition = '') {
       for (let i = 0; i <= 7; i++) {
         const queryPointserver = new mars3d.query.QueryArcServer({
-          url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRqDataServer/MapServer/' + i,
+          url: 'http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/' + i,
           popup: 'all',
           pageSize: 3000
         })
@@ -837,7 +837,7 @@
     // 坐标定位，居中，绘点
     setCenter(position) {
       this.center = position
-      var center = { lat: this.center[1], lng: this.center[0], alt: 30000, heading: 360, pitch: -45 }
+      var center = { lat: this.center[1], lng: this.center[0], alt: 10000, heading: 360, pitch: -45 }
       window.map.setCameraView(center)
     },
     // 坐标拾取， 在地图上绘点