diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already
diff --git a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
index 7ae8038..7b84375 100644
--- a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
+++ b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
@@ -37,6 +37,10 @@
           </div>
         </div>
         <div style="width:40%;height: 100%;">
+          <el-radio-group v-model="isShow" size="mini" style="position: absolute; top: 0px;right: 20px;">
+            <el-radio-button :label="true">交通指数</el-radio-button>
+            <el-radio-button :label="false">违法指数</el-radio-button>
+          </el-radio-group>
           <traffic-index-line v-if="isShow"/>
           <traffic-index-bar v-if="!isShow"/>
         </div>
@@ -125,7 +129,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   methods: {

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already
diff --git a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
index 7ae8038..7b84375 100644
--- a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
+++ b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
@@ -37,6 +37,10 @@
           </div>
         </div>
         <div style="width:40%;height: 100%;">
+          <el-radio-group v-model="isShow" size="mini" style="position: absolute; top: 0px;right: 20px;">
+            <el-radio-button :label="true">交通指数</el-radio-button>
+            <el-radio-button :label="false">违法指数</el-radio-button>
+          </el-radio-group>
           <traffic-index-line v-if="isShow"/>
           <traffic-index-bar v-if="!isShow"/>
         </div>
@@ -125,7 +129,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   methods: {
diff --git a/src/views/mapViews/mars3dMap.vue b/src/views/mapViews/mars3dMap.vue
index 990d9d4..25c2bf5 100644
--- a/src/views/mapViews/mars3dMap.vue
+++ b/src/views/mapViews/mars3dMap.vue
@@ -87,6 +87,7 @@
 import gridPopulation from './components/population/gridPopulation.vue'
 import buildingPopulation from './components/population/buildingPopulation.vue'
 import { formatDateDefault } from '../../utils'
+import mapKey from '../../../static/map.json'
 // 导入必须的样式表
 var Cesium = require('../../../node_modules/cesium/Source/Cesium')
 export default {
@@ -94,7 +95,7 @@
   components: {MapFrame, Button2, Button3, buildingPopulation, communityInfo, areaPopulation, gridPopulation},
   data () {
     return {
-      mapType: 'vec',
+      mapType: 'img',
       top: '250px',
       showFrame: false,
       showCommunityInfo: false,
@@ -191,7 +192,7 @@
           children: [
             {index: '21', name: '智慧管网', children: ['电子标识器', '液位监测仪', '消防栓防盗水监测仪', '有害气体监测仪', '井盖状态监测仪', '噪声记录仪', '燃气智能监测终端', '数据集中器']},
             {index: '26', name: '智慧城管', children: []},
-            {index: '22', name: '智慧工地', children: []},
+            {index: '22', name: '环境监测', children: []},
             {index: '23', name: '一卡通', children: []},
             {index: '25', name: '智慧园林', children: ['温湿度传感器', '水位检测器', 'PM2.5/PM10传感器']}
           ],
@@ -317,10 +318,19 @@
           this.labelsRight[i].layersShowRight[j] = false
         }
       }
+
       if (value.index === '05') { // 车辆
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         // 获取车辆并且渲染
         this.drawCar()
       } else if (value.index === '03') { // 事件监测
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         this.layers.feature.clear()
         this.layers.polygon.clear()
         this.singleSearch('事件监测', 'eventMonitor', '2V026Q9MNX', require('@/assets/images/icon-event.png'),
@@ -463,7 +473,7 @@
             id: 'arcgis_labels',
             name: '天地图注记',
             type: 'xyz',
-            url: 'https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=216ee92889e17ab1b083fae665d522b8',
+            url: `https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=${mapKey.tdtKey}`,
             subdomains: '01234567',
             crs: 'wgs84',
             zIndex: 30,
@@ -473,7 +483,7 @@
       }
       // 创建三维地球场景
       var map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 'vec' // 默认加载地图
+      map.basemap = 'img' // 默认加载地图
       map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [ Cesium.CameraEventType.RIGHT_DRAG ]
@@ -655,7 +665,7 @@
           [ {name: '路灯编号', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
       } else if (value.index === '22') {
         this.singleSearch('环境监测', 'B-ZH-0706', 'JFK37I1F45', require('@/assets/images/icon-camera-blu.png'),
-          [ {name: '设备名称', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
+          [ {name: '名称', value: 'YSMC'}, {name: '地点', value: 'S_DZQC'}, {name: '状态', value: 'BJZT'} ], false)
       } else if (value === '城管执法事件') {
         this.singleSearch(value, 'B-ZH-0402', '4X137UY07J', require('@/assets/images/icon-camera-blu.png'),
           [ {name: '案件名称', value: 'YSMC'}, {name: '案件分类', value: 'XXDLXMC'}, {name: '案件详情', value: 'S_DZQC'} ], false)
@@ -729,7 +739,7 @@
         this.showBuildingPopulation = true
         this.$refs.buildingPopulationRef.initData()
       } else if (value.index === 'new06') { // 城市交通-拥堵点
-        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-jam.png'),
+        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '拥堵高发时段', value: 'congestion_period'},
@@ -750,7 +760,7 @@
             {name: '地址', value: 'location'}
           ], false, true)
       } else if (value.index === 'new08') { // 城市交通-高发事故点
-        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-accident.png'),
+        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '事故类型', value: 'accident_type'},
@@ -891,7 +901,7 @@
             let graphic = new mars3d.graphic.PolygonEntity({
               positions: items,
               style: {
-                color: '#bebebe',
+                color: '#33c481',
                 opacity: 0.5,
                 outline: true,
                 outlineWidth: 2,
@@ -912,7 +922,7 @@
               let graphic = new mars3d.graphic.PolygonEntity({
                 positions: items,
                 style: {
-                  color: '#bebebe',
+                  color: '#33c481',
                   opacity: 0.5,
                   outline: true,
                   outlineWidth: 2,

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already
diff --git a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
index 7ae8038..7b84375 100644
--- a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
+++ b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
@@ -37,6 +37,10 @@
           </div>
         </div>
         <div style="width:40%;height: 100%;">
+          <el-radio-group v-model="isShow" size="mini" style="position: absolute; top: 0px;right: 20px;">
+            <el-radio-button :label="true">交通指数</el-radio-button>
+            <el-radio-button :label="false">违法指数</el-radio-button>
+          </el-radio-group>
           <traffic-index-line v-if="isShow"/>
           <traffic-index-bar v-if="!isShow"/>
         </div>
@@ -125,7 +129,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   methods: {
diff --git a/src/views/mapViews/mars3dMap.vue b/src/views/mapViews/mars3dMap.vue
index 990d9d4..25c2bf5 100644
--- a/src/views/mapViews/mars3dMap.vue
+++ b/src/views/mapViews/mars3dMap.vue
@@ -87,6 +87,7 @@
 import gridPopulation from './components/population/gridPopulation.vue'
 import buildingPopulation from './components/population/buildingPopulation.vue'
 import { formatDateDefault } from '../../utils'
+import mapKey from '../../../static/map.json'
 // 导入必须的样式表
 var Cesium = require('../../../node_modules/cesium/Source/Cesium')
 export default {
@@ -94,7 +95,7 @@
   components: {MapFrame, Button2, Button3, buildingPopulation, communityInfo, areaPopulation, gridPopulation},
   data () {
     return {
-      mapType: 'vec',
+      mapType: 'img',
       top: '250px',
       showFrame: false,
       showCommunityInfo: false,
@@ -191,7 +192,7 @@
           children: [
             {index: '21', name: '智慧管网', children: ['电子标识器', '液位监测仪', '消防栓防盗水监测仪', '有害气体监测仪', '井盖状态监测仪', '噪声记录仪', '燃气智能监测终端', '数据集中器']},
             {index: '26', name: '智慧城管', children: []},
-            {index: '22', name: '智慧工地', children: []},
+            {index: '22', name: '环境监测', children: []},
             {index: '23', name: '一卡通', children: []},
             {index: '25', name: '智慧园林', children: ['温湿度传感器', '水位检测器', 'PM2.5/PM10传感器']}
           ],
@@ -317,10 +318,19 @@
           this.labelsRight[i].layersShowRight[j] = false
         }
       }
+
       if (value.index === '05') { // 车辆
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         // 获取车辆并且渲染
         this.drawCar()
       } else if (value.index === '03') { // 事件监测
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         this.layers.feature.clear()
         this.layers.polygon.clear()
         this.singleSearch('事件监测', 'eventMonitor', '2V026Q9MNX', require('@/assets/images/icon-event.png'),
@@ -463,7 +473,7 @@
             id: 'arcgis_labels',
             name: '天地图注记',
             type: 'xyz',
-            url: 'https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=216ee92889e17ab1b083fae665d522b8',
+            url: `https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=${mapKey.tdtKey}`,
             subdomains: '01234567',
             crs: 'wgs84',
             zIndex: 30,
@@ -473,7 +483,7 @@
       }
       // 创建三维地球场景
       var map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 'vec' // 默认加载地图
+      map.basemap = 'img' // 默认加载地图
       map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [ Cesium.CameraEventType.RIGHT_DRAG ]
@@ -655,7 +665,7 @@
           [ {name: '路灯编号', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
       } else if (value.index === '22') {
         this.singleSearch('环境监测', 'B-ZH-0706', 'JFK37I1F45', require('@/assets/images/icon-camera-blu.png'),
-          [ {name: '设备名称', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
+          [ {name: '名称', value: 'YSMC'}, {name: '地点', value: 'S_DZQC'}, {name: '状态', value: 'BJZT'} ], false)
       } else if (value === '城管执法事件') {
         this.singleSearch(value, 'B-ZH-0402', '4X137UY07J', require('@/assets/images/icon-camera-blu.png'),
           [ {name: '案件名称', value: 'YSMC'}, {name: '案件分类', value: 'XXDLXMC'}, {name: '案件详情', value: 'S_DZQC'} ], false)
@@ -729,7 +739,7 @@
         this.showBuildingPopulation = true
         this.$refs.buildingPopulationRef.initData()
       } else if (value.index === 'new06') { // 城市交通-拥堵点
-        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-jam.png'),
+        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '拥堵高发时段', value: 'congestion_period'},
@@ -750,7 +760,7 @@
             {name: '地址', value: 'location'}
           ], false, true)
       } else if (value.index === 'new08') { // 城市交通-高发事故点
-        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-accident.png'),
+        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '事故类型', value: 'accident_type'},
@@ -891,7 +901,7 @@
             let graphic = new mars3d.graphic.PolygonEntity({
               positions: items,
               style: {
-                color: '#bebebe',
+                color: '#33c481',
                 opacity: 0.5,
                 outline: true,
                 outlineWidth: 2,
@@ -912,7 +922,7 @@
               let graphic = new mars3d.graphic.PolygonEntity({
                 positions: items,
                 style: {
-                  color: '#bebebe',
+                  color: '#33c481',
                   opacity: 0.5,
                   outline: true,
                   outlineWidth: 2,
diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue
index e74e6ad..34b4fa1 100644
--- a/src/views/socialLive/socialLivelihoodRight.vue
+++ b/src/views/socialLive/socialLivelihoodRight.vue
@@ -35,7 +35,7 @@
           <!--右33%-->
           <div class="modular-col-30">
             <div class="modular-row-30"  style="position: relative;">
-              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 140px;">
+              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 1rem;">
                 <el-radio-button label="education">教育</el-radio-button>
                 <el-radio-button label="hospital">医疗</el-radio-button>
               </el-radio-group>

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already
diff --git a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
index 7ae8038..7b84375 100644
--- a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
+++ b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
@@ -37,6 +37,10 @@
           </div>
         </div>
         <div style="width:40%;height: 100%;">
+          <el-radio-group v-model="isShow" size="mini" style="position: absolute; top: 0px;right: 20px;">
+            <el-radio-button :label="true">交通指数</el-radio-button>
+            <el-radio-button :label="false">违法指数</el-radio-button>
+          </el-radio-group>
           <traffic-index-line v-if="isShow"/>
           <traffic-index-bar v-if="!isShow"/>
         </div>
@@ -125,7 +129,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   methods: {
diff --git a/src/views/mapViews/mars3dMap.vue b/src/views/mapViews/mars3dMap.vue
index 990d9d4..25c2bf5 100644
--- a/src/views/mapViews/mars3dMap.vue
+++ b/src/views/mapViews/mars3dMap.vue
@@ -87,6 +87,7 @@
 import gridPopulation from './components/population/gridPopulation.vue'
 import buildingPopulation from './components/population/buildingPopulation.vue'
 import { formatDateDefault } from '../../utils'
+import mapKey from '../../../static/map.json'
 // 导入必须的样式表
 var Cesium = require('../../../node_modules/cesium/Source/Cesium')
 export default {
@@ -94,7 +95,7 @@
   components: {MapFrame, Button2, Button3, buildingPopulation, communityInfo, areaPopulation, gridPopulation},
   data () {
     return {
-      mapType: 'vec',
+      mapType: 'img',
       top: '250px',
       showFrame: false,
       showCommunityInfo: false,
@@ -191,7 +192,7 @@
           children: [
             {index: '21', name: '智慧管网', children: ['电子标识器', '液位监测仪', '消防栓防盗水监测仪', '有害气体监测仪', '井盖状态监测仪', '噪声记录仪', '燃气智能监测终端', '数据集中器']},
             {index: '26', name: '智慧城管', children: []},
-            {index: '22', name: '智慧工地', children: []},
+            {index: '22', name: '环境监测', children: []},
             {index: '23', name: '一卡通', children: []},
             {index: '25', name: '智慧园林', children: ['温湿度传感器', '水位检测器', 'PM2.5/PM10传感器']}
           ],
@@ -317,10 +318,19 @@
           this.labelsRight[i].layersShowRight[j] = false
         }
       }
+
       if (value.index === '05') { // 车辆
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         // 获取车辆并且渲染
         this.drawCar()
       } else if (value.index === '03') { // 事件监测
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         this.layers.feature.clear()
         this.layers.polygon.clear()
         this.singleSearch('事件监测', 'eventMonitor', '2V026Q9MNX', require('@/assets/images/icon-event.png'),
@@ -463,7 +473,7 @@
             id: 'arcgis_labels',
             name: '天地图注记',
             type: 'xyz',
-            url: 'https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=216ee92889e17ab1b083fae665d522b8',
+            url: `https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=${mapKey.tdtKey}`,
             subdomains: '01234567',
             crs: 'wgs84',
             zIndex: 30,
@@ -473,7 +483,7 @@
       }
       // 创建三维地球场景
       var map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 'vec' // 默认加载地图
+      map.basemap = 'img' // 默认加载地图
       map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [ Cesium.CameraEventType.RIGHT_DRAG ]
@@ -655,7 +665,7 @@
           [ {name: '路灯编号', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
       } else if (value.index === '22') {
         this.singleSearch('环境监测', 'B-ZH-0706', 'JFK37I1F45', require('@/assets/images/icon-camera-blu.png'),
-          [ {name: '设备名称', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
+          [ {name: '名称', value: 'YSMC'}, {name: '地点', value: 'S_DZQC'}, {name: '状态', value: 'BJZT'} ], false)
       } else if (value === '城管执法事件') {
         this.singleSearch(value, 'B-ZH-0402', '4X137UY07J', require('@/assets/images/icon-camera-blu.png'),
           [ {name: '案件名称', value: 'YSMC'}, {name: '案件分类', value: 'XXDLXMC'}, {name: '案件详情', value: 'S_DZQC'} ], false)
@@ -729,7 +739,7 @@
         this.showBuildingPopulation = true
         this.$refs.buildingPopulationRef.initData()
       } else if (value.index === 'new06') { // 城市交通-拥堵点
-        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-jam.png'),
+        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '拥堵高发时段', value: 'congestion_period'},
@@ -750,7 +760,7 @@
             {name: '地址', value: 'location'}
           ], false, true)
       } else if (value.index === 'new08') { // 城市交通-高发事故点
-        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-accident.png'),
+        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '事故类型', value: 'accident_type'},
@@ -891,7 +901,7 @@
             let graphic = new mars3d.graphic.PolygonEntity({
               positions: items,
               style: {
-                color: '#bebebe',
+                color: '#33c481',
                 opacity: 0.5,
                 outline: true,
                 outlineWidth: 2,
@@ -912,7 +922,7 @@
               let graphic = new mars3d.graphic.PolygonEntity({
                 positions: items,
                 style: {
-                  color: '#bebebe',
+                  color: '#33c481',
                   opacity: 0.5,
                   outline: true,
                   outlineWidth: 2,
diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue
index e74e6ad..34b4fa1 100644
--- a/src/views/socialLive/socialLivelihoodRight.vue
+++ b/src/views/socialLive/socialLivelihoodRight.vue
@@ -35,7 +35,7 @@
           <!--右33%-->
           <div class="modular-col-30">
             <div class="modular-row-30"  style="position: relative;">
-              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 140px;">
+              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 1rem;">
                 <el-radio-button label="education">教育</el-radio-button>
                 <el-radio-button label="hospital">医疗</el-radio-button>
               </el-radio-group>
diff --git a/static/map.json b/static/map.json
new file mode 100644
index 0000000..32d5ca1
--- /dev/null
+++ b/static/map.json
@@ -0,0 +1,4 @@
+{
+  "tdtKey": "42294073fb00551b34840b539e7fa50c",
+  "keyBak": "216ee92889e17ab1b083fae665d522b8"
+}

diff --git a/config/index.js b/config/index.js
index 6563782..70878c9 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,7 @@
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/cloudBrainTest/',
+    assetsPublicPath: '/cloudBrainTest1/',
 
     /**
      * Source Maps
diff --git a/src/components/annularProgress/annularComp.vue b/src/components/annularProgress/annularComp.vue
index 9ebb040..d35776a 100644
--- a/src/components/annularProgress/annularComp.vue
+++ b/src/components/annularProgress/annularComp.vue
@@ -18,7 +18,8 @@
         <span>名称：{{data.name}}</span>
       </div>
       <div>
-        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span>
+        <span>在线设备数：<b :style="'color:'+data.color">{{value.online}}</b></span><br/>
+        <!-- <span>异常设备数：<b :style="'color:'+data.color">{{value.error}}</b></span> -->
         <!-- <span>离线率：{{data.leave}} %</span> -->
       </div>
       <div>
@@ -87,18 +88,21 @@
       console.log('refreshValue')
       // const val = this.value
       if (val) {
-        const online = Math.round(val.online / val.total * 100) // 求在线率
-        this.data.online = online
-        this.data.leave = 100 - online
+        // const rate = Math.round(val.online / val.total * 100) // 求在线率
+        const rate = Math.trunc((val.online / val.total) * 100) // 求在线率
+        console.log('refreshValue计算', val.online, val.total, Math.trunc(val.online / val.total))
+        this.data.online = rate
+        this.data.leave = 100 - rate
         this.data.color = val.color[0]
         this.data.name = val.name
         this.data.echartData = {
           id: val.id,
           width: 0,
           height: 0,
-          percent: online,
+          percent: rate,
           color: val.color
         }
+        console.log('refreshValue计算', this.data, rate)
       }
     }
   }
@@ -131,7 +135,7 @@
         -webkit-transform: scale(.5);
         b{
           font-weight: bold;
-          font-size: .1rem
+          font-size: 0.09rem
         }
       }
     }
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index 186729d..a8f7650 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -25,48 +25,48 @@
     return {
       isShow: false,
       data: [
-        {
-          'name': '井盖状态监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '液位监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '燃气智能终端',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '有害气体监测仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '噪声记录仪',
-          'total': 0,
-          'online': 0,
-          'color': ['#fc5e5f', '#f90006']
-        },
-        {
-          'name': '摄像头',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        },
-        {
-          'name': '路灯控制器',
-          'total': 0,
-          'online': 0,
-          'color': ['#39edfb', '#19ddff']
-        }
+        // {
+        //   'name': '井盖状态监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '液位监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '燃气智能终端',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '有害气体监测仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '噪声记录仪',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#fc5e5f', '#f90006']
+        // },
+        // {
+        //   'name': '摄像头',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // },
+        // {
+        //   'name': '路灯控制器',
+        //   'total': 0,
+        //   'online': 0,
+        //   'color': ['#39edfb', '#19ddff']
+        // }
       ]
     }
   },
diff --git a/src/views/cityConstruction/components/plan/components/landUse.vue b/src/views/cityConstruction/components/plan/components/landUse.vue
index 2e12697..934d23e 100644
--- a/src/views/cityConstruction/components/plan/components/landUse.vue
+++ b/src/views/cityConstruction/components/plan/components/landUse.vue
@@ -30,6 +30,10 @@
         </div>
       </div>
       <!--各项目的竣工情况-->
+      <el-radio-group v-model="currentComp" size="mini" style="position: absolute; top: -0.2rem;left: 1rem;" @change="changeradio">
+        <el-radio-button label="data1">居住</el-radio-button>
+        <el-radio-button label="data2">公共</el-radio-button>
+      </el-radio-group>
       <div v-for="(value,index) in data" class="landList">
         <gauge-item
           :title="value.title"
@@ -84,7 +88,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   mounted () {
@@ -106,6 +110,9 @@
       clearInterval(this.compTimer)
       this.compTimer = null
     },
+    changeradio () {
+      this.getData()
+    },
     getData () {
       this.total = mockData.planningLandUse.total
       this.already = mockData.planningLandUse.already
diff --git a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
index 7ae8038..7b84375 100644
--- a/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
+++ b/src/views/cityManage/components/wisdomTraffic/trafficSafety.vue
@@ -37,6 +37,10 @@
           </div>
         </div>
         <div style="width:40%;height: 100%;">
+          <el-radio-group v-model="isShow" size="mini" style="position: absolute; top: 0px;right: 20px;">
+            <el-radio-button :label="true">交通指数</el-radio-button>
+            <el-radio-button :label="false">违法指数</el-radio-button>
+          </el-radio-group>
           <traffic-index-line v-if="isShow"/>
           <traffic-index-bar v-if="!isShow"/>
         </div>
@@ -125,7 +129,7 @@
     }
   },
   created () {
-    this.compChange()
+    // this.compChange()
     this.getData()
   },
   methods: {
diff --git a/src/views/mapViews/mars3dMap.vue b/src/views/mapViews/mars3dMap.vue
index 990d9d4..25c2bf5 100644
--- a/src/views/mapViews/mars3dMap.vue
+++ b/src/views/mapViews/mars3dMap.vue
@@ -87,6 +87,7 @@
 import gridPopulation from './components/population/gridPopulation.vue'
 import buildingPopulation from './components/population/buildingPopulation.vue'
 import { formatDateDefault } from '../../utils'
+import mapKey from '../../../static/map.json'
 // 导入必须的样式表
 var Cesium = require('../../../node_modules/cesium/Source/Cesium')
 export default {
@@ -94,7 +95,7 @@
   components: {MapFrame, Button2, Button3, buildingPopulation, communityInfo, areaPopulation, gridPopulation},
   data () {
     return {
-      mapType: 'vec',
+      mapType: 'img',
       top: '250px',
       showFrame: false,
       showCommunityInfo: false,
@@ -191,7 +192,7 @@
           children: [
             {index: '21', name: '智慧管网', children: ['电子标识器', '液位监测仪', '消防栓防盗水监测仪', '有害气体监测仪', '井盖状态监测仪', '噪声记录仪', '燃气智能监测终端', '数据集中器']},
             {index: '26', name: '智慧城管', children: []},
-            {index: '22', name: '智慧工地', children: []},
+            {index: '22', name: '环境监测', children: []},
             {index: '23', name: '一卡通', children: []},
             {index: '25', name: '智慧园林', children: ['温湿度传感器', '水位检测器', 'PM2.5/PM10传感器']}
           ],
@@ -317,10 +318,19 @@
           this.labelsRight[i].layersShowRight[j] = false
         }
       }
+
       if (value.index === '05') { // 车辆
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         // 获取车辆并且渲染
         this.drawCar()
       } else if (value.index === '03') { // 事件监测
+        this.showCommunityInfo = false
+        this.showAreaPopulation = false
+        this.showGridPopulation = false
+        this.showBuildingPopulation = false
         this.layers.feature.clear()
         this.layers.polygon.clear()
         this.singleSearch('事件监测', 'eventMonitor', '2V026Q9MNX', require('@/assets/images/icon-event.png'),
@@ -463,7 +473,7 @@
             id: 'arcgis_labels',
             name: '天地图注记',
             type: 'xyz',
-            url: 'https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=216ee92889e17ab1b083fae665d522b8',
+            url: `https://t{s}.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=${mapKey.tdtKey}`,
             subdomains: '01234567',
             crs: 'wgs84',
             zIndex: 30,
@@ -473,7 +483,7 @@
       }
       // 创建三维地球场景
       var map = new mars3d.Map('mars3dContainer', mapOptions)
-      map.basemap = 'vec' // 默认加载地图
+      map.basemap = 'img' // 默认加载地图
       map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [ Cesium.CameraEventType.RIGHT_DRAG ]
@@ -655,7 +665,7 @@
           [ {name: '路灯编号', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
       } else if (value.index === '22') {
         this.singleSearch('环境监测', 'B-ZH-0706', 'JFK37I1F45', require('@/assets/images/icon-camera-blu.png'),
-          [ {name: '设备名称', value: 'YSMC'}, {name: '设备地点', value: 'S_DZQC'} ], false)
+          [ {name: '名称', value: 'YSMC'}, {name: '地点', value: 'S_DZQC'}, {name: '状态', value: 'BJZT'} ], false)
       } else if (value === '城管执法事件') {
         this.singleSearch(value, 'B-ZH-0402', '4X137UY07J', require('@/assets/images/icon-camera-blu.png'),
           [ {name: '案件名称', value: 'YSMC'}, {name: '案件分类', value: 'XXDLXMC'}, {name: '案件详情', value: 'S_DZQC'} ], false)
@@ -729,7 +739,7 @@
         this.showBuildingPopulation = true
         this.$refs.buildingPopulationRef.initData()
       } else if (value.index === 'new06') { // 城市交通-拥堵点
-        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-jam.png'),
+        this.singleSearch('拥堵点分布', '/traffic/jam', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '拥堵高发时段', value: 'congestion_period'},
@@ -750,7 +760,7 @@
             {name: '地址', value: 'location'}
           ], false, true)
       } else if (value.index === 'new08') { // 城市交通-高发事故点
-        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-accident.png'),
+        this.singleSearch('高发事故点分布', '/traffic/eventHigh', '05VA87X3PX', require('@/assets/images/icon-camera-red.png'),
           [
             {name: '名称', value: 'name'},
             {name: '事故类型', value: 'accident_type'},
@@ -891,7 +901,7 @@
             let graphic = new mars3d.graphic.PolygonEntity({
               positions: items,
               style: {
-                color: '#bebebe',
+                color: '#33c481',
                 opacity: 0.5,
                 outline: true,
                 outlineWidth: 2,
@@ -912,7 +922,7 @@
               let graphic = new mars3d.graphic.PolygonEntity({
                 positions: items,
                 style: {
-                  color: '#bebebe',
+                  color: '#33c481',
                   opacity: 0.5,
                   outline: true,
                   outlineWidth: 2,
diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue
index e74e6ad..34b4fa1 100644
--- a/src/views/socialLive/socialLivelihoodRight.vue
+++ b/src/views/socialLive/socialLivelihoodRight.vue
@@ -35,7 +35,7 @@
           <!--右33%-->
           <div class="modular-col-30">
             <div class="modular-row-30"  style="position: relative;">
-              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 140px;">
+              <el-radio-group v-model="radio" size="mini" style="position: absolute; top: 0px;left: 1rem;">
                 <el-radio-button label="education">教育</el-radio-button>
                 <el-radio-button label="hospital">医疗</el-radio-button>
               </el-radio-group>
diff --git a/static/map.json b/static/map.json
new file mode 100644
index 0000000..32d5ca1
--- /dev/null
+++ b/static/map.json
@@ -0,0 +1,4 @@
+{
+  "tdtKey": "42294073fb00551b34840b539e7fa50c",
+  "keyBak": "216ee92889e17ab1b083fae665d522b8"
+}
diff --git a/static/plan.json b/static/plan.json
index 447d136..a02d323 100644
--- a/static/plan.json
+++ b/static/plan.json
@@ -122,8 +122,8 @@
         {
           "name": "液位监测仪",
           "total": 320,
-          "online": 320,
-          "error": 0,
+          "online": 319,
+          "error": 1,
           "color": ["#fc5e5f", "#f90006"]
         },
         {
@@ -143,8 +143,8 @@
         {
           "name": "噪声记录仪",
           "total": 408,
-          "online": 408,
-          "error": 0,
+          "online": 406,
+          "error": 2,
           "color": ["#fc5e5f", "#f90006"]
         },
         {