diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
   },
   // 登录页面
   { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
-  // 3d地图
+  // 3d地图-赣州
   { path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+  // 章丘地图页
+  { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+  // 章丘首页
+  { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面

diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
   },
   // 登录页面
   { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
-  // 3d地图
+  // 3d地图-赣州
   { path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+  // 章丘地图页
+  { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+  // 章丘首页
+  { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 4426ba1..5127d49 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
 import PopupDataFilter from '@/views/overview/components/popupDataFilter'
 import PopupLocation from '@/views/overview/components/popupLocation'
 import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
 import axios from 'axios'
 // import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
 // import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
 import 'mars3d/dist/mars3d.css'
 import 'mars3d/dist/mars3d.js'
 import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
 
 let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
 let rqline_layer = null
 let rqpoint_layer = null
 let rqpoint3D_layer = null
 let queryLineserver = null
 let queryPointserver = null
 export default {
-  name: 'Overview3D',
+  name: 'Overview3dzq',
   components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
   data() {
     return {
@@ -79,7 +79,7 @@
       searchResultOffset: [-12, -30],
       searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
       showAlarm: true, // 是否显示报警
-      alpha: 100,
+      alpha: 80,
       toolShow: false, // 工具栏是否显示
       menus: {
         menuList: [
@@ -116,7 +116,6 @@
       tempMarker: null,
       showClearBtn: false, // 是否显示清除查询按钮
       bloomEffect: null,
-      kaptcha: '',
       loadToken: false
     }
   },
@@ -128,7 +127,9 @@
   },
   watch: {
     alpha(val) {
-      window.map.basemap.opacity = val / 100
+      window.viewer.imageryLayers._layers.forEach(layer => {
+        layer.alpha = val / 100 // 我们可以设置为0
+      })
       underground.alpha = val / 100
       if (val <= 90 && window.map.level >= 19) {
         rqline_layer.show = false
@@ -166,7 +167,7 @@
   },
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.$store.dispatch('GetConfig').then(() => {
-      // this.$message.success('连接服务器成功')
+      this.$message.success('连接服务器成功')
       this.handleLogin()
     }).catch((e) => {
       // this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
       const loginForm = {
         sid: this.$store.getters.sid,
         username: 'admin',
-        password: RSAencrypt('111111')
+        password: RSAencrypt('1q2W3E4R')
       }
       this.$store.dispatch('Login', loginForm).then(() => {
         // this.$message.success('登录成功')
@@ -204,6 +205,7 @@
         tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
       })
       var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer.alpha = this.alpha / 100
       // window.viewer.zoomTo(layer)
       return layer
     },
@@ -256,63 +258,85 @@
               { name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
               { name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
             ]
-          },
-          {
-            'id': 1112,
-            'pid': 10,
-            'name': '天地图电子',
-            'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
-            'type': 'group',
-            'layers': [
-              { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
-              { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
-            ]
-          },
-          {
-            'id': 1113,
-            'pid': 10,
-            'name': '天地图影像',
-            'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
-            'type': 'tdt',
-            'layer': 'img_d',
-            'key': ['216ee92889e17ab1b083fae665d522b8'],
-            'show': true
           }
+          // {
+          //   'id': 1112,
+          //   'pid': 10,
+          //   'name': '天地图电子',
+          //   'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+          //   'type': 'group',
+          //   'layers': [
+          //     { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+          //     { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+          //   ]
+          // },
+          // {
+          //   'id': 1113,
+          //   'pid': 10,
+          //   'name': '天地图影像',
+          //   'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+          //   'type': 'tdt',
+          //   'layer': 'img_d',
+          //   'key': ['216ee92889e17ab1b083fae665d522b8'],
+          //   'show': true
+          // }
         ]
       }
       Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
       // 创建viewer实例
-      // window.viewer = new Cesium.Viewer('mars3dContainer',
-      //   {
-      //     geocoder: false, // 是否显示地名查找控件
-      //     infoBox: false,
-      //     animation: false, // 是否显示动画控件(左下方那个)
-      //     timeline: false, // 是否显示时间线控件
-      //     shadows: false, // 阴影是否被太阳投射
-      //     showldAnimate: true, // 让场景中的动画自动播放
-      //     sceneModePicker: false, // 是否显示投影方式控件
-      //     fullscreenButton: false, // 全屏按钮不显示
-      //     homeButton: false,
-      //     navigationHelpButton: false, // 帮助按钮
-      //     baseLayerPicker: false,
-      //     imageryProvider: new Cesium.TileMapServiceImageryProvider({
-      //       url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
-      //     })
-      //   })
+      window.viewer = new Cesium.Viewer('mars3dContainer', {
+        geocoder: false, // 是否显示地名查找控件
+        infoBox: false,
+        animation: false, // 是否显示动画控件(左下方那个)
+        timeline: false, // 是否显示时间线控件
+        shadows: false, // 阴影是否被太阳投射
+        showldAnimate: true, // 让场景中的动画自动播放
+        sceneModePicker: false, // 是否显示投影方式控件
+        fullscreenButton: false, // 全屏按钮不显示
+        homeButton: false,
+        navigationHelpButton: false, // 帮助按钮
+        baseLayerPicker: false,
+        imageryProvider: new Cesium.TileMapServiceImageryProvider({
+          url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+        })
+      })
       // window.viewer.imageryLayers._layers[0].show = false
       // window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
-      // window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
+      window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
       // mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
-      const map = new mars3d.Map('mars3dContainer', mapOptions)
+      const map = new mars3d.Map(window.viewer, mapOptions)
 
-      // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+      const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+      const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
 
-      // const map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 1113
-      // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
-      // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
-      //
+      var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+        url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+        layer: 'wzmap_map',
+        style: 'default',
+        tileMatrixSetID: 'default028mm',
+        format: 'image/png',
+        tilingScheme: new Cesium.GeographicTilingScheme(),
+        tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+      })
+      layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer2021.alpha = this.alpha / 100
+
+      layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+        url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+        layer: 'wzmap_map',
+        style: 'default',
+        tileMatrixSetID: 'default028mm',
+        format: 'image/png',
+        tilingScheme: new Cesium.GeographicTilingScheme(),
+        tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+      })
+      layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer2020.alpha = this.alpha / 100
+
+      layer2021.show = false
+
       // layer2021 = this.SuperMap3DImageryProvider(url2021)
+      // layer2020 = this.SuperMap3DImageryProvider(url2020)
       // map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
       //   enabled: true
       // })
       // map.addEffect(this.bloomEffect)
-      window.map.basemap.opacity = this.alpha / 100
+      // window.map.basemap.opacity = this.alpha / 100
       // 崩溃后刷新
       map.on(mars3d.EventType.renderError, function(event) {
         window.location.reload()
@@ -508,17 +532,22 @@
     changeBaseMap(type) {
       this.baseLayer = type
       if (type === 'gaode_vec') {
-        window.map.basemap = 1112
+        layer2021.show = true
+        layer2020.show = false
+        window.viewer.imageryLayers.raiseToTop(layer2021)
+        // window.map.basemap = 1112
         // if (this.bloomEffect !== null) {
         //   this.bloomEffect.enabled = false
         // }
       } else {
-        window.map.basemap = 1113
+        layer2021.show = false
+        layer2020.show = true
+        window.viewer.imageryLayers.raiseToTop(layer2020)
+        // window.map.basemap = 1113
         // if (this.bloomEffect !== null) {
         //   this.bloomEffect.enabled = true
         // }
       }
-      window.viewer.imageryLayers.raiseToTop(layer2021)
     },
     // 倒计时函数
     countDown() {
@@ -752,7 +781,6 @@
           // 获取当前报警列表
           this.alarmListOri = response.data // 列表原始
           this.alarmList = response.data // 要显示的报警列表
-          this.alarmList = [{}, {}]
           this.alarmWells = [] // 报警的井列表
           for (const alarm of response.data) {
             if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -947,6 +975,46 @@
     margin-bottom: 0px;
   }
 }
+// 刷新框
+.function-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 1100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  /*background-color: rgba(244, 233, 230, 1.0);*/
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
 // 地图
 .overview-map-container{
   width: 100%;
@@ -976,11 +1044,11 @@
 }
 .cover{
   position: absolute;
-  bottom: 3px;
+  bottom: 0px;
   left: 0px;
   /*background-color: red;*/
-  background-color: #000000;
+  background-color: #1a2126;
   width: 100px;
-  height: 25px;
+  height: 30px;
 }
 </style>

diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
   },
   // 登录页面
   { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
-  // 3d地图
+  // 3d地图-赣州
   { path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+  // 章丘地图页
+  { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+  // 章丘首页
+  { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 4426ba1..5127d49 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
 import PopupDataFilter from '@/views/overview/components/popupDataFilter'
 import PopupLocation from '@/views/overview/components/popupLocation'
 import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
 import axios from 'axios'
 // import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
 // import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
 import 'mars3d/dist/mars3d.css'
 import 'mars3d/dist/mars3d.js'
 import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
 
 let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
 let rqline_layer = null
 let rqpoint_layer = null
 let rqpoint3D_layer = null
 let queryLineserver = null
 let queryPointserver = null
 export default {
-  name: 'Overview3D',
+  name: 'Overview3dzq',
   components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
   data() {
     return {
@@ -79,7 +79,7 @@
       searchResultOffset: [-12, -30],
       searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
       showAlarm: true, // 是否显示报警
-      alpha: 100,
+      alpha: 80,
       toolShow: false, // 工具栏是否显示
       menus: {
         menuList: [
@@ -116,7 +116,6 @@
       tempMarker: null,
       showClearBtn: false, // 是否显示清除查询按钮
       bloomEffect: null,
-      kaptcha: '',
       loadToken: false
     }
   },
@@ -128,7 +127,9 @@
   },
   watch: {
     alpha(val) {
-      window.map.basemap.opacity = val / 100
+      window.viewer.imageryLayers._layers.forEach(layer => {
+        layer.alpha = val / 100 // 我们可以设置为0
+      })
       underground.alpha = val / 100
       if (val <= 90 && window.map.level >= 19) {
         rqline_layer.show = false
@@ -166,7 +167,7 @@
   },
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.$store.dispatch('GetConfig').then(() => {
-      // this.$message.success('连接服务器成功')
+      this.$message.success('连接服务器成功')
       this.handleLogin()
     }).catch((e) => {
       // this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
       const loginForm = {
         sid: this.$store.getters.sid,
         username: 'admin',
-        password: RSAencrypt('111111')
+        password: RSAencrypt('1q2W3E4R')
       }
       this.$store.dispatch('Login', loginForm).then(() => {
         // this.$message.success('登录成功')
@@ -204,6 +205,7 @@
         tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
       })
       var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer.alpha = this.alpha / 100
       // window.viewer.zoomTo(layer)
       return layer
     },
@@ -256,63 +258,85 @@
               { name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
               { name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
             ]
-          },
-          {
-            'id': 1112,
-            'pid': 10,
-            'name': '天地图电子',
-            'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
-            'type': 'group',
-            'layers': [
-              { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
-              { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
-            ]
-          },
-          {
-            'id': 1113,
-            'pid': 10,
-            'name': '天地图影像',
-            'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
-            'type': 'tdt',
-            'layer': 'img_d',
-            'key': ['216ee92889e17ab1b083fae665d522b8'],
-            'show': true
           }
+          // {
+          //   'id': 1112,
+          //   'pid': 10,
+          //   'name': '天地图电子',
+          //   'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+          //   'type': 'group',
+          //   'layers': [
+          //     { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+          //     { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+          //   ]
+          // },
+          // {
+          //   'id': 1113,
+          //   'pid': 10,
+          //   'name': '天地图影像',
+          //   'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+          //   'type': 'tdt',
+          //   'layer': 'img_d',
+          //   'key': ['216ee92889e17ab1b083fae665d522b8'],
+          //   'show': true
+          // }
         ]
       }
       Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
       // 创建viewer实例
-      // window.viewer = new Cesium.Viewer('mars3dContainer',
-      //   {
-      //     geocoder: false, // 是否显示地名查找控件
-      //     infoBox: false,
-      //     animation: false, // 是否显示动画控件(左下方那个)
-      //     timeline: false, // 是否显示时间线控件
-      //     shadows: false, // 阴影是否被太阳投射
-      //     showldAnimate: true, // 让场景中的动画自动播放
-      //     sceneModePicker: false, // 是否显示投影方式控件
-      //     fullscreenButton: false, // 全屏按钮不显示
-      //     homeButton: false,
-      //     navigationHelpButton: false, // 帮助按钮
-      //     baseLayerPicker: false,
-      //     imageryProvider: new Cesium.TileMapServiceImageryProvider({
-      //       url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
-      //     })
-      //   })
+      window.viewer = new Cesium.Viewer('mars3dContainer', {
+        geocoder: false, // 是否显示地名查找控件
+        infoBox: false,
+        animation: false, // 是否显示动画控件(左下方那个)
+        timeline: false, // 是否显示时间线控件
+        shadows: false, // 阴影是否被太阳投射
+        showldAnimate: true, // 让场景中的动画自动播放
+        sceneModePicker: false, // 是否显示投影方式控件
+        fullscreenButton: false, // 全屏按钮不显示
+        homeButton: false,
+        navigationHelpButton: false, // 帮助按钮
+        baseLayerPicker: false,
+        imageryProvider: new Cesium.TileMapServiceImageryProvider({
+          url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+        })
+      })
       // window.viewer.imageryLayers._layers[0].show = false
       // window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
-      // window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
+      window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
       // mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
-      const map = new mars3d.Map('mars3dContainer', mapOptions)
+      const map = new mars3d.Map(window.viewer, mapOptions)
 
-      // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+      const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+      const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
 
-      // const map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 1113
-      // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
-      // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
-      //
+      var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+        url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+        layer: 'wzmap_map',
+        style: 'default',
+        tileMatrixSetID: 'default028mm',
+        format: 'image/png',
+        tilingScheme: new Cesium.GeographicTilingScheme(),
+        tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+      })
+      layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer2021.alpha = this.alpha / 100
+
+      layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+        url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+        layer: 'wzmap_map',
+        style: 'default',
+        tileMatrixSetID: 'default028mm',
+        format: 'image/png',
+        tilingScheme: new Cesium.GeographicTilingScheme(),
+        tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+      })
+      layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+      layer2020.alpha = this.alpha / 100
+
+      layer2021.show = false
+
       // layer2021 = this.SuperMap3DImageryProvider(url2021)
+      // layer2020 = this.SuperMap3DImageryProvider(url2020)
       // map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
       //   enabled: true
       // })
       // map.addEffect(this.bloomEffect)
-      window.map.basemap.opacity = this.alpha / 100
+      // window.map.basemap.opacity = this.alpha / 100
       // 崩溃后刷新
       map.on(mars3d.EventType.renderError, function(event) {
         window.location.reload()
@@ -508,17 +532,22 @@
     changeBaseMap(type) {
       this.baseLayer = type
       if (type === 'gaode_vec') {
-        window.map.basemap = 1112
+        layer2021.show = true
+        layer2020.show = false
+        window.viewer.imageryLayers.raiseToTop(layer2021)
+        // window.map.basemap = 1112
         // if (this.bloomEffect !== null) {
         //   this.bloomEffect.enabled = false
         // }
       } else {
-        window.map.basemap = 1113
+        layer2021.show = false
+        layer2020.show = true
+        window.viewer.imageryLayers.raiseToTop(layer2020)
+        // window.map.basemap = 1113
         // if (this.bloomEffect !== null) {
         //   this.bloomEffect.enabled = true
         // }
       }
-      window.viewer.imageryLayers.raiseToTop(layer2021)
     },
     // 倒计时函数
     countDown() {
@@ -752,7 +781,6 @@
           // 获取当前报警列表
           this.alarmListOri = response.data // 列表原始
           this.alarmList = response.data // 要显示的报警列表
-          this.alarmList = [{}, {}]
           this.alarmWells = [] // 报警的井列表
           for (const alarm of response.data) {
             if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -947,6 +975,46 @@
     margin-bottom: 0px;
   }
 }
+// 刷新框
+.function-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 1100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  /*background-color: rgba(244, 233, 230, 1.0);*/
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
 // 地图
 .overview-map-container{
   width: 100%;
@@ -976,11 +1044,11 @@
 }
 .cover{
   position: absolute;
-  bottom: 3px;
+  bottom: 0px;
   left: 0px;
   /*background-color: red;*/
-  background-color: #000000;
+  background-color: #1a2126;
   width: 100px;
-  height: 25px;
+  height: 30px;
 }
 </style>
diff --git a/src/views/zhangqiu/zqindex.vue b/src/views/zhangqiu/zqindex.vue
new file mode 100644
index 0000000..c5cdbca
--- /dev/null
+++ b/src/views/zhangqiu/zqindex.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="full-container">
+    <!--    <overview3dzq />-->
+    <!--    <iframe src="http://192.168.83.32/zq/" class="charts" />-->
+  </div>
+</template>
+
+<script>
+// import Overview3dzq from '@/views/overview/overview3dzq'
+export default {
+  name: 'Zqindex',
+  // components: { Overview3dzq },
+  data() {
+    return {}
+  }
+}
+</script>
+<style lang="scss" scoped>
+.full-container{
+  width:100%;
+  height: 100%;
+  position: relative;
+  .charts{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 9999;
+    left: 0px;
+    top: 0px;
+
+  }
+}
+</style>